# HG changeset patch
# User Axel Hecht <axel@pike.org>
# Date 1593610995 -7200
# Node ID 383005aa9cdcc0202af05b97fcb1657d890e56ca
# Parent  f58928715d0c62c7ca85f237aee9bec8fd4b27f9
run-tests: find python binary on Python 3 (issue6361)

Return strings from _findprogram as all callers expect
unicode strings.
Previously the check in _usecorrectpython agains sysexecutable
was always false on Python 3.

Differential Revision: https://phab.mercurial-scm.org/D8674

diff -r f58928715d0c -r 383005aa9cdc tests/run-tests.py
--- a/tests/run-tests.py	Mon Jun 29 16:36:53 2020 +0200
+++ b/tests/run-tests.py	Wed Jul 01 15:43:15 2020 +0200
@@ -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)