From nobody Fri Jan 13 08:13:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NtZ1g3873z2sTQj; Fri, 13 Jan 2023 08:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NtZ1g2kNRz3FSN; Fri, 13 Jan 2023 08:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673597623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5Zq3s/avxyv3XXYuud/k5nOTwpepf0g/WWXog1V4Ng=; b=urnAuxB0spiJIbl2pgmCQoOywl0U2/c2WDNay1bgL/BgZInz6RZudgm+ynO9pFq9OQWVOv z4/qdn+u7+Z7GUHBajMuixv5RahWjyTdIfEfCQlujJQwYnzAERazPQpKLjHv5ACpjHrNrY YJDGGP+cfMNDT/c3S9/SBrCsIqOAI8IwlFjEzhWLSSVaXjneaj/K/Wla+oZvN9WsioyX4F mya1/7oRjg6QifCTpp8m41RnibHCYR0TFjjZzxRjnOAG5pUwsdpvm+1rrfFA4aFqlVTa8a OJn8nzwF2MxMtwRxDGhRBaW91e2+RGvL53bg1WFQRTLqhWuT/DC6kVSRGCjlJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673597623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5Zq3s/avxyv3XXYuud/k5nOTwpepf0g/WWXog1V4Ng=; b=mx8LvDE4NMNO3lSlCHB4Qx90GOQXVJ0I41PP4+VJklMJWDOXJzTs+8dAXcXsBp78U55ktC 7dP12vYMocHfAtcgInRuPFOHJsoDfnWt4JMiZwhKj0wwEKp8mKS56eaJsgvDdjy6Bz50ci m23G06jK9l9eR+mWlNpd7+yzwROIMsDb1jtNEvUpFhM6ByVb7dy1yrwtYZYUqil7qeex2b chbNQb4FCaxBQQIiVs8X38JiToRgyDqfOmY4LKWxy7pH7SHcf0yrvXQ4V2kHEzXjDDw1uJ tZB9US34Q86e5cb8XWyC5hnvlwOle/d+0cO5IsT3VPGrum8AfSYnic7eLV78Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673597623; a=rsa-sha256; cv=none; b=UOYFPD+qxMjqhdw9H0IjeowNhn6aO6LYHV6ltQ0hkJVqKNp8KS6GrMAsOI46TwZ4FgU1mM n5tjcS/Ne5YJwt1FpFn766E4XRMwjbmCTDyL6Pm8HbONDPuHpkrnfqVMmfiLSoF/vkNmvl 4u3H0AlsH8gv5kmwkXuvLPTyyW7IUPF3d9eT+K8250Wc6b8h8+8Y0P6+BAANvpmu6vuDFn xV8HQ4+MUxlTRwW/RqLmAhsQid52FRVYASxC4RSDS/UZKAKRPXK8VQOXJyn7TmUs4Vx+HJ /YbXdaQDpsYdrc7zinu7ePMKkNlBvkidwha0Oowfgv/ovcABi4QQBSagW9FhBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NtZ1g1mftz11Fb; Fri, 13 Jan 2023 08:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30D8Dh3c008587; Fri, 13 Jan 2023 08:13:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30D8Dh8X008586; Fri, 13 Jan 2023 08:13:43 GMT (envelope-from git) Date: Fri, 13 Jan 2023 08:13:43 GMT Message-Id: <202301130813.30D8Dh8X008586@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: bc220a9f1148 - main - devel/libgit2: only build test suite when we request it and adjust tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc220a9f11481453f1f9b3864dcadc2c37b8eca8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc220a9f11481453f1f9b3864dcadc2c37b8eca8 commit bc220a9f11481453f1f9b3864dcadc2c37b8eca8 Author: Daniel Engberg AuthorDate: 2023-01-13 08:11:10 +0000 Commit: Matthias Fechner CommitDate: 2023-01-13 08:13:08 +0000 devel/libgit2: only build test suite when we request it and adjust tests There's still one failure that seems to be occurring if you're running as root [1] and I'm unable to work out where and/or if upstream ever fixed this test. References: https://github.com/archlinux/svntogit-packages/blob/packages/libgit2/trunk/PKGBUILD 1: https://github.com/libgit2/libgit2/issues/6307 PR: 268572 --- devel/libgit2/Makefile | 16 ++- .../files/patch-tests_libgit2_network_url_parse.c | 116 +++++++++++++++++++++ 2 files changed, 122 insertions(+), 10 deletions(-) diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile index c757c815352b..4537569b02e7 100644 --- a/devel/libgit2/Makefile +++ b/devel/libgit2/Makefile @@ -17,12 +17,15 @@ LICENSE= GPLv2 LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libhttp_parser.so:www/http-parser -USES= cmake cpe pkgconfig python:build ssl +USES= cmake:testing cpe pkgconfig python:build ssl USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_ARGS= -DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system -CMAKE_OFF= BUILD_CLAR +CMAKE_TESTING_ON= BUILD_TESTS + +CMAKE_ARGS= -DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system \ + -DCMAKE_CTEST_ARGUMENTS="-E;'invasive|online'" +CMAKE_OFF= BUILD_TESTS PLIST_SUB= DISTVERSION=${DISTVERSION} \ SHLIB_VER=${DISTVERSION:R} @@ -43,11 +46,4 @@ post-patch: ${WRKSRC}/cmake/SelectHTTPSBackend.cmake .endif -do-test: - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ - -DBUILD_CLAR=ON ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} CTEST_OUTPUT_ON_FAILURE=1 ${MAKE_CMD} ${MAKE_ARGS} test - .include diff --git a/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c b/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c new file mode 100644 index 000000000000..1e7cea713eb0 --- /dev/null +++ b/devel/libgit2/files/patch-tests_libgit2_network_url_parse.c @@ -0,0 +1,116 @@ +--- tests/libgit2/network/url/parse.c.orig 2022-07-14 00:06:59 UTC ++++ tests/libgit2/network/url/parse.c +@@ -63,18 +63,6 @@ void test_network_url_parse__hostname_implied_root_cus + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_url_parse__hostname_implied_root_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "example.com"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_url_parse__hostname_encoded_password(void) + { + cl_git_pass(git_net_url_parse(&conndata, +@@ -129,18 +117,6 @@ void test_network_url_parse__hostname_port(void) + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_url_parse__hostname_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "example.com"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/resource"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_url_parse__hostname_user_port(void) + { + /* user@hostname.tld:port/resource */ +@@ -219,18 +195,6 @@ void test_network_url_parse__ipv4_implied_root_custom_ + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_url_parse__ipv4_implied_root_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "192.168.1.1"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_url_parse__ipv4_encoded_password(void) + { + cl_git_pass(git_net_url_parse(&conndata, +@@ -283,18 +247,6 @@ void test_network_url_parse__ipv4_port(void) + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_url_parse__ipv4_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:/resource")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "192.168.1.1"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/resource"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_url_parse__ipv4_user_port(void) + { + cl_git_pass(git_net_url_parse(&conndata, +@@ -371,18 +323,6 @@ void test_network_url_parse__ipv6_implied_root_custom_ + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); + } + +-void test_network_url_parse__ipv6_implied_root_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); +-} +- + void test_network_url_parse__ipv6_encoded_password(void) + { + cl_git_pass(git_net_url_parse(&conndata, +@@ -433,18 +373,6 @@ void test_network_url_parse__ipv6_port(void) + cl_assert_equal_p(conndata.username, NULL); + cl_assert_equal_p(conndata.password, NULL); + cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); +-} +- +-void test_network_url_parse__ipv6_empty_port(void) +-{ +- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:/resource")); +- cl_assert_equal_s(conndata.scheme, "http"); +- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); +- cl_assert_equal_s(conndata.port, "80"); +- cl_assert_equal_s(conndata.path, "/resource"); +- cl_assert_equal_p(conndata.username, NULL); +- cl_assert_equal_p(conndata.password, NULL); +- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); + } + + void test_network_url_parse__ipv6_user_port(void)