Show More
@@ -103,6 +103,7 b" if 'java' in sys.platform:" | |||||
103 |
|
103 | |||
104 | requiredtools = [os.path.basename(sys.executable), "diff", "grep", "unzip", |
|
104 | requiredtools = [os.path.basename(sys.executable), "diff", "grep", "unzip", | |
105 | "gunzip", "bunzip2", "sed"] |
|
105 | "gunzip", "bunzip2", "sed"] | |
|
106 | createdfiles = [] | |||
106 |
|
107 | |||
107 | defaults = { |
|
108 | defaults = { | |
108 | 'jobs': ('HGTEST_JOBS', 1), |
|
109 | 'jobs': ('HGTEST_JOBS', 1), | |
@@ -420,6 +421,11 b' def cleanup(options):' | |||||
420 | if not options.keep_tmpdir: |
|
421 | if not options.keep_tmpdir: | |
421 | vlog("# Cleaning up HGTMP", HGTMP) |
|
422 | vlog("# Cleaning up HGTMP", HGTMP) | |
422 | shutil.rmtree(HGTMP, True) |
|
423 | shutil.rmtree(HGTMP, True) | |
|
424 | for f in createdfiles: | |||
|
425 | try: | |||
|
426 | os.remove(f) | |||
|
427 | except OSError: | |||
|
428 | pass | |||
423 |
|
429 | |||
424 | def usecorrectpython(): |
|
430 | def usecorrectpython(): | |
425 | # some tests run python interpreter. they must use same |
|
431 | # some tests run python interpreter. they must use same | |
@@ -439,6 +445,7 b' def usecorrectpython():' | |||||
439 | if findprogram(pyexename) != sys.executable: |
|
445 | if findprogram(pyexename) != sys.executable: | |
440 | try: |
|
446 | try: | |
441 | os.symlink(sys.executable, mypython) |
|
447 | os.symlink(sys.executable, mypython) | |
|
448 | createdfiles.append(mypython) | |||
442 | except OSError, err: |
|
449 | except OSError, err: | |
443 | # child processes may race, which is harmless |
|
450 | # child processes may race, which is harmless | |
444 | if err.errno != errno.EEXIST: |
|
451 | if err.errno != errno.EEXIST: |
General Comments 0
You need to be logged in to leave comments.
Login now