[Git][NTPsec/ntpsec][buildtest] 3 commits: Upgrade waf to 1.9.14-a50064fef518fa947e70ff62762268c39aaaca77

[Ian Bruene]

Ian Bruene pushed to branch buildtest at NTPsec / ntpsec


Commits:
416c90ae by Matt Selsky at 2017-12-02T20:24:21+00:00
Upgrade waf to 1.9.14-a50064fef518fa947e70ff62762268c39aaaca77

Picks up the fix for https://github.com/waf-project/waf/pull/2087 among other
things

Partial fix for Gitlab issue #416

- - - - -
cb25ec33 by Matt Selsky at 2017-12-02T20:24:21+00:00
Avoid installing python scripts as if they were modules

Fixes Gitlab issue #416

- - - - -
9175f958 by Ian Bruene at 2017-12-02T15:09:00-06:00
Python build tests now run all tests, not 1 test 4 times...

- - - - -


3 changed files:

- tests/wscript
- waf
- wscript


Changes:

=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -125,13 +125,15 @@ def build(ctx):
             pass
         os.symlink(pypath.abspath(), linkpath.abspath())
 
-    for path in ["pylib/test_util.py",
-                 "pylib/test_agentx.py",
-                 "pylib/test_packet.py",
-                 "pylib/test_statfiles.py"]:
+    pytests = ["pylib/test_util.py",
+               "pylib/test_agentx.py",
+               "pylib/test_packet.py",
+               "pylib/test_statfiles.py"]
+
+    for path in pytests:
         ctx(
             features="pytest",
-            pytest_source="pylib/test_util.py",
+            pytest_source=path,
             ut_str="${PYTHON} ${SRC}"
         )
 


=====================================
waf
=====================================
The diff for this file was not included because it is too large.

=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -1088,10 +1088,11 @@ def build(ctx):
     ctx.recurse("attic")
     ctx.recurse("tests")
 
-    # Make sure the python scripts actually get compiled
+    # Make sure the python scripts compile, but don't install them
     ctx(
         features="py",
         source=python_scripts,
+        install_path=None,
     )
 
     scripts = ["ntpclients/ntpleapfetch"] + python_scripts



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/0c3450fed0ef9daedc82e43818619b529c354769...9175f9582f4a19d5cda3e13d201a68ab83dfcd73

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/0c3450fed0ef9daedc82e43818619b529c354769...9175f9582f4a19d5cda3e13d201a68ab83dfcd73
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20171202/fb9c37e3/attachment.html>