Mercurial > hg
comparison tests/run-tests.py @ 25038:66da89457c47
run-tests: fix _findprogram to reliably return bytes
author | Augie Fackler <augie@google.com> |
---|---|
date | Tue, 14 Apr 2015 15:56:44 -0400 |
parents | 570141fa38f9 |
children | 8505eb1bafb1 |
comparison
equal
deleted
inserted
replaced
25037:570141fa38f9 | 25038:66da89457c47 |
---|---|
2097 os.mkdir(adir) | 2097 os.mkdir(adir) |
2098 cov.annotate(directory=adir, omit=omit) | 2098 cov.annotate(directory=adir, omit=omit) |
2099 | 2099 |
2100 def _findprogram(self, program): | 2100 def _findprogram(self, program): |
2101 """Search PATH for a executable program""" | 2101 """Search PATH for a executable program""" |
2102 for p in os.environ.get('PATH', os.defpath).split(os.pathsep): | 2102 if sys.version_info[0] > 2: |
2103 dpb = os.defpath.encode('utf-8') | |
2104 sepb = os.pathsep.encode('utf-8') | |
2105 else: | |
2106 dpb = os.defpath | |
2107 sepb = os.pathsep | |
2108 for p in osenvironb.get(b'PATH', dpb).split(sepb): | |
2103 name = os.path.join(p, program) | 2109 name = os.path.join(p, program) |
2104 if os.name == 'nt' or os.access(name, os.X_OK): | 2110 if os.name == 'nt' or os.access(name, os.X_OK): |
2105 return name | 2111 return name |
2106 return None | 2112 return None |
2107 | 2113 |