From nobody Tue Apr 23 23:04:53 2024 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 4VPHks56Gfz5JGft; Tue, 23 Apr 2024 23:04:53 +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 4VPHks4VCbz55Tn; Tue, 23 Apr 2024 23:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713913493; 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=mGOqXUfMHLkRjsG6M1fp/fCGKMtubm/gb+5SZ+Uw6CQ=; b=NbhciVDh1s2a2Skjq0vbmiNKtCkca9GB1CTZoHuJgI6XOWph3ZpXcNqYNWhhBXrg90WNRJ R2FzJ6hoJNmJWrZ71UCB6Mjnczktpm1Sc70jV1NMQXhxMcxawr5Z98OxebNWLZvtK6zuZe qYHtuE2MMFuzQydqh9tA5q+mP1xPly57FE6r2S5YEc5qpvcBPt1wL7+skhYQpJwPq9SklE Nt6DIF7xdazDrgUN80fo6QnF4YfXoQtdzBL/BwJDo5qSuHSf0m8TaOIfqFaiIgB3LU2/lj bKkeJhCzxSUULZLMhPQ+edxxqicbthYwQkHBVA7u6mj0/Bfjd8LCLOqb+qXV7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713913493; a=rsa-sha256; cv=none; b=W7pyKV1HN1Vn2pGeQd/vn5S3kbBuuLZP4mSTHL8mfCMPQk+ZVB6WvxqwGkOIdeYcdlox3r weboTJMbKP4ksz5z1OuXeCJ05DCrBlWSXjobLDUfE6Ma6qvR2cy/MGdWoKt1+zWyNU5H1d 66Zm2aOo32z8wtvdg7sPalGjzcDDB52IE6X7RpWeaaDXhusmyVtogTFGPma6AZhf/dCiRV jZsfrupCpzxpAWclT38bWB1ZqSop44EiBGrLSrGBczXKMDbB9zsRmz2gtPTysUvzQ7s0FO XkS+GJAxZ5SXke5+w3fl/vdZlbH0qvMHfp6UQDL2MHzUuZdahvIomKkt5FDwww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713913493; 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=mGOqXUfMHLkRjsG6M1fp/fCGKMtubm/gb+5SZ+Uw6CQ=; b=TWv5zOabPmSvio6WGvn25Qpk1FKdy7pzUdXoWx/kCONeIOTQyMf6RWffgpjk3kTPaLUmUn uufTSXCDvivrQ0a+IkFMX3ZgzeVa9lXYHo0QyGjP/f4U5zEBX6s4txJWAbbVQ0lrHoMpk2 E74FLMaaqfgZoPn6piY0F7ikmcpf4KO+/Q4Vvw519NsOTQHMwYzTvhqhfXt51ThWveuPHc yrc5pDjKbpRapvwPPZjNuU7SzgxkKkswe7e9HQcDopQifID1SuTyBBeDxaXIWWyqodqXSD GjkPDAYwQ5/IttfoDn+jx7tVJKr1275Xw4M0mYpIooe7hNy4w2a+gc3ElyrB3g== 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 4VPHks3zmRzrJ2; Tue, 23 Apr 2024 23:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NN4rk6016461; Tue, 23 Apr 2024 23:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NN4rNA016458; Tue, 23 Apr 2024 23:04:53 GMT (envelope-from git) Date: Tue, 23 Apr 2024 23:04:53 GMT Message-Id: <202404232304.43NN4rNA016458@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 6bc8a7b91b23 - main - ports-mgmt/poudriere*: Add 'make test' metadata for port. 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bc8a7b91b23c7680944bf57f378d6434899d31f Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bc8a7b91b23c7680944bf57f378d6434899d31f commit 6bc8a7b91b23c7680944bf57f378d6434899d31f Author: Bryan Drewery AuthorDate: 2024-04-23 14:04:23 +0000 Commit: Bryan Drewery CommitDate: 2024-04-23 14:04:23 +0000 ports-mgmt/poudriere*: Add 'make test' metadata for port. This is not adding 'make test' support to Poudriere. It is only for the port right now. --- ports-mgmt/poudriere-devel/Makefile | 21 +++++++++++++++++++++ .../poudriere-devel/files/patch-test_common.sh | 19 +++++++++++++++++++ ports-mgmt/poudriere/Makefile | 20 ++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index cdf118816a2b..8e01abc4f4d6 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -35,6 +35,27 @@ PORTCONFIG_RUN_DEPENDS= portconfig>0:ports-mgmt/portconfig QEMU_DESC= Add qemu-user-static for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static + +# gmake is not strictly needed but handles test jobs better +TEST_DEPENDS= gmake>0:devel/gmake +TEST_ENV= MAKE=gmake +MAKE_CMD= gmake +TEST_TARGET= check +TEST_ARGS= -s +TEST_ARGS+= ${_MAKE_JOBS} +# ccache passthrough helps for building pkg a few hundred times. +# ccache not added as a dependency because it is only used if setup +# and provided in the env already. +# XXX: Passthrough local PKGREPOSITORY dir for fetch support +ccache_vars= CCACHE_DIR_NON_ROOT_SAFE CCACHE_GROUP \ + CCACHE_GID CCACHE_STATIC_PREFIX CCACHE_TEMPDIR \ + CCACHE_DIR CCACHE_NLEVELS +.for _cv in ${ccache_vars} +. if !empty(${_cv}) +TEST_ENV+= ${_cv}=${${_cv}} +. endif +.endfor + .include # rm -x support came in 10.0. A bundled rm is used if not supported in base. diff --git a/ports-mgmt/poudriere-devel/files/patch-test_common.sh b/ports-mgmt/poudriere-devel/files/patch-test_common.sh new file mode 100644 index 000000000000..bd79c439750f --- /dev/null +++ b/ports-mgmt/poudriere-devel/files/patch-test_common.sh @@ -0,0 +1,19 @@ +commit a94cfcd734a0ac81cf157378b77732a3de6b9463 +Author: Bryan Drewery +Date: Tue Apr 23 06:29:13 2024 -0700 + + tests: Don't run git-log from 'make test' for Poudriere in ports + + This results in a very long lookup that returns nothing + +--- test/common.sh.orig 2024-04-20 03:48:57 UTC ++++ test/common.sh +@@ -550,6 +550,7 @@ msg_debug "getpid: $$" + + msg_debug "getpid: $$" + +-if git_get_hash_and_dirty "${abs_top_srcdir}" git_hash git_dirty; then ++if [ -r "${abs_top_srcdir}/.git" ] && ++ git_get_hash_and_dirty "${abs_top_srcdir}" git_hash git_dirty; then + msg "Source git hash: ${git_hash} modified: ${git_dirty}" + fi >&2 diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 613e30e9fcfd..ab6a7a2d31fb 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -35,6 +35,26 @@ PORTCONFIG_RUN_DEPENDS= portconfig>0:ports-mgmt/portconfig QEMU_DESC= Add qemu-user-static for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static +# gmake is not strictly needed but handles test jobs better +TEST_DEPENDS= gmake>0:devel/gmake +TEST_ENV= MAKE=gmake +MAKE_CMD= gmake +TEST_TARGET= check +TEST_ARGS= -s +TEST_ARGS+= ${_MAKE_JOBS} +# ccache passthrough helps for building pkg a few hundred times. +# ccache not added as a dependency because it is only used if setup +# and provided in the env already. +# XXX: Passthrough local PKGREPOSITORY dir for fetch support +ccache_vars= CCACHE_DIR_NON_ROOT_SAFE CCACHE_GROUP \ + CCACHE_GID CCACHE_STATIC_PREFIX CCACHE_TEMPDIR \ + CCACHE_DIR CCACHE_NLEVELS +.for _cv in ${ccache_vars} +. if !empty(${_cv}) +TEST_ENV+= ${_cv}=${${_cv}} +. endif +.endfor + .include # rm -x support came in 10.0. A bundled rm is used if not supported in base.