diff tests/run-tests.py @ 45046:dd3050227a84

merge with stable
author Augie Fackler <augie@google.com>
date Mon, 06 Jul 2020 22:02:50 -0400
parents 4a503c1b664a 383005aa9cdc
children a659d5a4d2d5
line wrap: on
line diff
--- a/tests/run-tests.py	Sun Jul 05 13:09:22 2020 +0200
+++ b/tests/run-tests.py	Mon Jul 06 22:02:50 2020 -0400
@@ -3681,7 +3681,7 @@
         for p in osenvironb.get(b'PATH', dpb).split(sepb):
             name = os.path.join(p, program)
             if os.name == 'nt' or os.access(name, os.X_OK):
-                return name
+                return _bytes2sys(name)
         return None
 
     def _checktools(self):
@@ -3692,7 +3692,7 @@
             found = self._findprogram(p)
             p = p.decode("utf-8")
             if found:
-                vlog("# Found prerequisite", p, "at", _bytes2sys(found))
+                vlog("# Found prerequisite", p, "at", found)
             else:
                 print("WARNING: Did not find prerequisite tool: %s " % p)