[Git][NTPsec/ntpsec][20k-Nov22-install-test-fix] bin_test: fix typo remove copypasta

[James Browning]

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


Commits:
9508f06d by James Browning at 2020-11-27T05:16:29-08:00
bin_test: fix typo remove copypasta


- - - - -


1 changed file:

- wafhelpers/bin_test.py


Changes:

=====================================
wafhelpers/bin_test.py
=====================================
@@ -58,7 +58,7 @@ def run(cmd, expected, pythonic, apath=None, environ=None):
     """Run an individual test."""
     odir = apath if apath else waflib.Context.out_dir
 
-    environ = environ is isinstance(environ, dict) else {}
+    environ = environ if isinstance(environ, dict) else {}
     if apath:
         cmd = [os.sep.join(['.'] + cmd[0].split(os.sep)[-1:])] + list(cmd[1:])
     prefix = "running: " + " ".join(cmd)
@@ -107,7 +107,7 @@ def cmd_bin_test(ctx):
         libpath = destdir + ctx.env.LIBDIR
         python_wrap = False
         if destdir != '/':
-            path = destdir + os.sep if destdir != '/'
+            path = destdir + os.sep
             spath = path + ctx.env.SBINDIR[1:] + os.sep
             path = path + ctx.env.BINDIR[1:] + os.sep
             env = {'PYTHONPATH': pypath,



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/9508f06d912684f17e8856178c406c9d120f3626
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/20201127/c2aa6ea7/attachment.htm>