Show More
@@ -762,21 +762,19 b' def tsttest(test, wd, options, replaceme' | |||||
762 | addsalt(n + 1, False) |
|
762 | addsalt(n + 1, False) | |
763 |
|
763 | |||
764 | # Write out the script and execute it |
|
764 | # Write out the script and execute it | |
765 | fd, name = tempfile.mkstemp(suffix='hg-tst') |
|
765 | name = wd + '.sh' | |
766 | try: |
|
766 | f = open(name, 'w') | |
767 |
|
|
767 | for l in script: | |
768 |
|
|
768 | f.write(l) | |
769 |
|
|
769 | f.close() | |
770 |
|
770 | |||
771 |
|
|
771 | cmd = '%s "%s"' % (options.shell, name) | |
772 |
|
|
772 | vlog("# Running", cmd) | |
773 |
|
|
773 | exitcode, output = run(cmd, wd, options, replacements, env) | |
774 |
|
|
774 | # do not merge output if skipped, return hghave message instead | |
775 |
|
|
775 | # similarly, with --debug, output is None | |
776 |
|
|
776 | if exitcode == SKIPPED_STATUS or output is None: | |
777 |
|
|
777 | return exitcode, output | |
778 | finally: |
|
|||
779 | os.remove(name) |
|
|||
780 |
|
778 | |||
781 | # Merge the script output back into a unified test |
|
779 | # Merge the script output back into a unified test | |
782 |
|
780 |
General Comments 0
You need to be logged in to leave comments.
Login now