Show More
@@ -70,6 +70,9 b' SKIPPED_STATUS = 80' | |||
|
70 | 70 | SKIPPED_PREFIX = 'skipped: ' |
|
71 | 71 | FAILED_PREFIX = 'hghave check failed: ' |
|
72 | 72 | PYTHON = sys.executable |
|
73 | IMPL_PATH = 'PYTHONPATH' | |
|
74 | if 'java' in sys.platform: | |
|
75 | IMPL_PATH = 'JYTHONPATH' | |
|
73 | 76 | |
|
74 | 77 | requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] |
|
75 | 78 | |
@@ -140,6 +143,9 b' def parseargs():' | |||
|
140 | 143 | parser.set_defaults(**defaults) |
|
141 | 144 | (options, args) = parser.parse_args() |
|
142 | 145 | |
|
146 | # jython is always pure | |
|
147 | options.pure = options.pure or 'java' in sys.platform | |
|
148 | ||
|
143 | 149 | if options.with_hg: |
|
144 | 150 | if not (os.path.isfile(options.with_hg) and |
|
145 | 151 | os.access(options.with_hg, os.X_OK)): |
@@ -907,10 +913,10 b' def main():' | |||
|
907 | 913 | # it, in case external libraries are only available via current |
|
908 | 914 | # PYTHONPATH. (In particular, the Subversion bindings on OS X |
|
909 | 915 | # are in /opt/subversion.) |
|
910 |
oldpypath = os.environ.get( |
|
|
916 | oldpypath = os.environ.get(IMPL_PATH) | |
|
911 | 917 | if oldpypath: |
|
912 | 918 | pypath.append(oldpypath) |
|
913 |
os.environ[ |
|
|
919 | os.environ[IMPL_PATH] = os.pathsep.join(pypath) | |
|
914 | 920 | |
|
915 | 921 | COVERAGE_FILE = os.path.join(TESTDIR, ".coverage") |
|
916 | 922 | |
@@ -931,7 +937,7 b' def main():' | |||
|
931 | 937 | vlog("# Using TESTDIR", TESTDIR) |
|
932 | 938 | vlog("# Using HGTMP", HGTMP) |
|
933 | 939 | vlog("# Using PATH", os.environ["PATH"]) |
|
934 |
vlog("# Using |
|
|
940 | vlog("# Using", IMPL_PATH, os.environ[IMPL_PATH]) | |
|
935 | 941 | |
|
936 | 942 | try: |
|
937 | 943 | if len(tests) > 1 and options.jobs > 1: |
General Comments 0
You need to be logged in to leave comments.
Login now