[Git][NTPsec/ntpsec][20k-Nov22-install-test-fix] 2 commits: CI: Disable /usr/local (un)install during testing because it is broken.

James Browning gitlab at mg.gitlab.com
Wed Nov 25 16:17:16 UTC 2020 


James Browning pushed to branch 20k-Nov22-install-test-fix at NTPsec / ntpsec


Commits:
dbd741da by James Browning at 2020-11-25T08:14:20-08:00
CI: Disable /usr/local (un)install during testing because it is broken.


- - - - -
6beb3c65 by James Browning at 2020-11-25T08:16:53-08:00
bin_test: reg is now expected, no run under python when installed.


- - - - -


2 changed files:

- .gitlab-ci.yml
- wafhelpers/bin_test.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -14,95 +14,95 @@ alpine-edge-basic:
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine-edge
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 debian-oldstable-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --disable-nts build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 debian-testing-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-testing
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 debian-unstable-basic:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-unstable
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 ubuntu-latest-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-latest
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 ubuntu-rolling-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-rolling
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 ubuntu-devel-basic:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 freebsd-11-basic:
   <<: *job_definition
   script:
     - python ./waf configure --disable-doc --disable-manpage --disable-nts build
-    - DESTDIR=build/prison python ./waf install||true 
-    - DESTDIR=./prison python ./waf install||true 
-    - DESTDIR=../prison python ./waf install||true 
-    - python ./waf install||true 
-    - python ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - DESTDIR=build/prison python ./waf install||true
+    - DESTDIR=./prison python ./waf install||true
+    - DESTDIR=../prison python ./waf install||true
+    - echo python ./waf install||true
+    - echo python ./waf uninstall||true
+    - rm -rf {buid,.,..}/prison
   tags:
     - freebsd-11
   rules:
@@ -112,12 +112,12 @@ freebsd-12-basic:
   <<: *job_definition
   script:
     - python ./waf configure --disable-doc --disable-manpage build
-    - DESTDIR=build/prison python ./waf install||true 
-    - DESTDIR=./prison python ./waf install||true 
-    - DESTDIR=../prison python ./waf install||true 
-    - python ./waf install||true 
-    - python ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - DESTDIR=build/prison python ./waf install||true
+    - DESTDIR=./prison python ./waf install||true
+    - DESTDIR=../prison python ./waf install||true
+    - echo python ./waf install||true
+    - echo python ./waf uninstall||true
+    - rm -rf {buid,.,..}/prison
   tags:
     - freebsd-12
   rules:
@@ -128,83 +128,83 @@ centos-latest-basic:
   image: $CI_REGISTRY/ntpsec/ntpsec/centos-latest
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 fedora-latest-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 fedora-rawhide-basic:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/fedora-rawhide
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 openSUSE-leap-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/opensuse-leap
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --disable-nts build  --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 openSUSE-tumbleweed-basic:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/opensuse-tumbleweed
   script:
     - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang python3
-    - DESTDIR=build/prison python3 ./waf install||true 
-    - DESTDIR=./prison python3 ./waf install||true 
-    - DESTDIR=../prison python3 ./waf install||true 
-    - python3 ./waf install||true 
+    - DESTDIR=build/prison python3 ./waf install||true
+    - DESTDIR=./prison python3 ./waf install||true
+    - DESTDIR=../prison python3 ./waf install||true
+    - python3 ./waf install||true
     - python3 ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 gentoo-hardened-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/gentoo-hardened
   script:
     - python ./waf configure --disable-doc --disable-manpage build
-    - DESTDIR=build/prison python ./waf install||true 
-    - DESTDIR=./prison python ./waf install||true 
-    - DESTDIR=../prison python ./waf install||true 
-    - python ./waf install||true 
+    - DESTDIR=build/prison python ./waf install||true
+    - DESTDIR=./prison python ./waf install||true
+    - DESTDIR=../prison python ./waf install||true
+    - python ./waf install||true
     - python ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
 
 macos-basic:
   <<: *job_definition
   script:
     - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build
-    - DESTDIR=build/prison python ./waf install||true 
-    - DESTDIR=./prison python ./waf install||true 
-    - DESTDIR=../prison python ./waf install||true 
-    - python ./waf install||true 
+    - DESTDIR=build/prison python ./waf install||true
+    - DESTDIR=./prison python ./waf install||true
+    - DESTDIR=../prison python ./waf install||true
+    - python ./waf install||true
     - python ./waf uninstall||true
-    - rm -rf {buid,.,..}/prison 
+    - rm -rf {buid,.,..}/prison
   tags:
     - macos
   rules:


=====================================
wafhelpers/bin_test.py
=====================================
@@ -54,8 +54,8 @@ def bin_test_summary(_):
         waflib.Logs.pprint(i[0], i[1])
 
 
-def run(cmd, reg, pythonic, apath=None, environ=None):
-    """Run an individual non-python test."""
+def run(cmd, expected, pythonic, apath=None, environ=None):
+    """Run an individual test."""
     check = False
     odir = apath if apath else waflib.Context.out_dir
 
@@ -79,14 +79,14 @@ def run(cmd, reg, pythonic, apath=None, environ=None):
 
     stdout, stderr = p.communicate()
 
-    if reg in (stdout, stderr):
+    if expected in (stdout, stderr):
         check = True
 
     if check:
         addLog("GREEN", prefix + "  OK")
         return True
     addLog("RED", prefix + "  FAILED")
-    addLog("PINK", "Expected: " + reg)
+    addLog("PINK", "Expected: " + expected)
     if stdout:
         addLog("PINK", "Got (stdout): " + stdout)
     if stderr:
@@ -99,6 +99,7 @@ def cmd_bin_test(ctx):
     fails = 0
     skips = 0
     env = {}
+    python_wrap = True
 
     destdir = os.path.abspath(os.environ.get('DESTDIR', '/'))
     path = spath = None
@@ -111,6 +112,7 @@ def cmd_bin_test(ctx):
         path = destdir + os.sep if destdir != '/' else '/'
         spath = path + ctx.env.SBINDIR[1:] + os.sep
         path = path + ctx.env.BINDIR[1:] + os.sep
+        python_wrap = False
         addLog('BLUE', 'Following relative to: %s' % spath)
 
     if ctx.env['PYTHON_ARGPARSE']:
@@ -133,7 +135,7 @@ def cmd_bin_test(ctx):
         skips = skips + 1 if status is None else skips
 
     for cmd in sorted(cmd_map_python):
-        status = run(cmd, cmd_map_python[cmd], True, path, env)
+        status = run(cmd, cmd_map_python[cmd], python_wrap, path, env)
         fails = fails + 1 if status is False else fails
         skips = skips + 1 if status is None else skips
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/327152cd25f1367baece6b3f73bd63be52a02c22...6beb3c65f33ed6164ec09977b8cad3b48a189202

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/327152cd25f1367baece6b3f73bd63be52a02c22...6beb3c65f33ed6164ec09977b8cad3b48a189202
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/20201125/10f05139/attachment-0001.htm>

More information about the vc mailing list