net-misc/ntpsec: Try to only run tests in src_test only

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

Bug: https://bugs.gentoo.org/795522
Closes: https://bugs.gentoo.org/838109
Signed-off-by: James T Browning <JamesB.fe80@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 82 insertions, 0 deletions

diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
new file mode 100644
index 000000000000..dab51a97fc0a
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
@@ -0,0 +1,48 @@
+From 1a7bb2e3a2749bd709ea4cf10b66b6f6d05aaf9d Mon Sep 17 00:00:00 2001
+From: James Browning <jamesb.fe80@gmail.com>
+Date: Sun, 10 Apr 2022 07:53:37 -0700
+Subject: [PATCH] I: NTPsec build does not repect --notests
+
+STR: (run the following)
+- git clone https://gitlab.com/NTPsec/ntpsec
+- cd ntpsec
+- ./waf configure build --notests -p
+
+AR: NTPsec runs tests despite having a parameter telling it not to
+ER: NTPsec should not run tests when it has been told not to
+---
+ wscript | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index c1d765046..d8a20b82e 100644
+--- a/wscript
++++ b/wscript
+@@ -1131,6 +1131,7 @@ def build(ctx):
+     ctx.manpage(8, "ntpclients/ntpsnmpd-man.adoc")
+ 
+     # Skip running unit tests on a cross compile build
++    from waflib import Options
+     if not ctx.env.ENABLE_CROSS:
+         # Force re-running of tests.  Same as 'waf --alltests'
+         if ctx.cmd == "check":
+@@ -1139,6 +1140,8 @@ def build(ctx):
+             # Print log if -v is supplied
+             if verbose > 0:
+                 ctx.add_post_fun(test_print_log)
++        elif Options.options.no_tests:
++            return
+ 
+         # Test binaries
+         ctx.add_post_fun(bin_test)
+@@ -1152,7 +1155,6 @@ def build(ctx):
+         ctx.add_post_fun(bin_test_summary)
+     else:
+         pprint("YELLOW", "Unit test runner skipped on a cross-compiled build.")
+-        from waflib import Options
+         Options.options.no_tests = True
+ 
+     if ctx.cmd == "build":
+-- 
+2.32.0
+
diff --git a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
new file mode 100644
index 000000000000..027c3df18ad2
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
@@ -0,0 +1,34 @@
+From f360741dec76a9c9d831f0b547596891ea321599 Mon Sep 17 00:00:00 2001
+From: James Browning <jamesb.fe80@gmail.com>
+Date: Sun, 10 Apr 2022 16:23:34 -0700
+Subject: [PATCH] clean test output up in Python 3
+
+---
+ wafhelpers/test.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/wafhelpers/test.py b/wafhelpers/test.py
+index 9351a5675..6bba34881 100644
+--- a/wafhelpers/test.py
++++ b/wafhelpers/test.py
+@@ -31,12 +31,13 @@ def test_print_log(ctx):
+         pprint("YELLOW", "RETURN VALUE:", retval)
+         print("")
+ 
+-        if retval or error:
++        if retval:
+             pprint("RED", "****** ERROR ******\n")
+ 
+-            print(error or lines)
++            print(polystr(error) or polystr(lines))
+ 
+-        if (not retval) and (not error):
+-            pprint("GREEN", "****** LOG ******\n", lines)
++        else:
++            pprint("GREEN", "****** LOG ******\n",
++                   polystr(lines), polystr(error))
+ 
+         print("")
+-- 
+2.32.0
+