[patch] proposed patch to ntpsec ebuilds and metadata.xml

0001-net-misc-ntpsec-Try-to-only-run-tests-in-src_test.patch (text/plain), 4.24 KB, created by James Browning on 2022-04-10 18:01:20 UTC

From 469c959f77caf0f7adf5fb5df4c90c9dce702d42 Mon Sep 17 00:00:00 2001
From: James Browning <[e-mail]>
Date: Sun, 10 Apr 2022 08:48:14 -0700
Subject: [PATCH] net-misc/ntpsec: Try to only run tests in src_test

Since ./waf test runs all the test, this eliminates the need for
the tests useflag which filled that space. Thus it's eliminated.

Signed-off-by: James T Browning <[e-mail]>
tested: no
---
 net-misc/ntpsec/metadata.xml           |  1 -
 net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild | 14 ++++++++++++--
 net-misc/ntpsec/ntpsec-9999.ebuild     | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 69f78f92c..e19df036b 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -31,6 +31,5 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
 		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
 		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
 		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
-		<flag name="tests">Enable tests</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
index 80e17ecb6..d063ab60d 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
@@ -30,7 +30,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -94,6 +94,7 @@ src_configure() {
 	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
 
 	local myconf=(
+		--notests
 		--nopyc
 		--nopyo
 		--enable-pylib ext
@@ -105,7 +106,6 @@ src_configure() {
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
 		$(use debug	&& echo "--enable-debug")
 	)
 
@@ -123,6 +123,16 @@ src_compile() {
 	python_foreach_impl run_in_build_dir python_compile
 }
 
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	local _mywafconfig
+	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
+
+	local jobs="--jobs=$(makeopts_jobs)"
+	echo "\"${WAF_BINARY}\" check ${_mywafconfig} ${jobs} ${*}"
+	"${WAF_BINARY}" check ${_mywafconfig} ${jobs} "${@}" || die "check failed"
+}
+
 src_install() {
 	python_install() {
 		waf-utils_src_install
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 2065ee52d..887738904 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -30,7 +30,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -92,6 +92,7 @@ src_configure() {
 	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
 
 	local myconf=(
+		--notests
 		--nopyc
 		--nopyo
 		--enable-pylib ext
@@ -103,7 +104,6 @@ src_configure() {
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
 		$(use debug	&& echo "--enable-debug")
 	)
 
@@ -121,6 +121,16 @@ src_compile() {
 	python_foreach_impl run_in_build_dir python_compile
 }
 
+src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+	local _mywafconfig
+	[[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose"
+
+	local jobs="--jobs=$(makeopts_jobs)"
+	echo "\"${WAF_BINARY}\" check ${_mywafconfig} ${jobs} ${*}"
+	"${WAF_BINARY}" check ${_mywafconfig} ${jobs} "${@}" || die "check failed"
+}
+
 src_install() {
 	python_install() {
 		waf-utils_src_install
-- 
2.32.0