# HG changeset patch # User Mads Kiilerich # Date 1380804647 -7200 # Node ID d69c1db7cf8b71c18cd6cb469bc1f10fd3fe79a4 # Parent 60e578eae19d3356637ea4a0c8239abcef5641db run-tests: place the .t shell script next to $TESTTMP and with a useful name --keep can thus keep it around - very convenient for debugging. [ original upstream message ] diff -r 60e578eae19d -r d69c1db7cf8b tests/run-tests.py --- a/tests/run-tests.py Wed Oct 02 22:46:32 2013 +0100 +++ b/tests/run-tests.py Thu Oct 03 14:50:47 2013 +0200 @@ -762,21 +762,19 @@ addsalt(n + 1, False) # Write out the script and execute it - fd, name = tempfile.mkstemp(suffix='hg-tst') - try: - for l in script: - os.write(fd, l) - os.close(fd) + name = wd + '.sh' + f = open(name, 'w') + for l in script: + f.write(l) + f.close() - cmd = '%s "%s"' % (options.shell, name) - vlog("# Running", cmd) - exitcode, output = run(cmd, wd, options, replacements, env) - # do not merge output if skipped, return hghave message instead - # similarly, with --debug, output is None - if exitcode == SKIPPED_STATUS or output is None: - return exitcode, output - finally: - os.remove(name) + cmd = '%s "%s"' % (options.shell, name) + vlog("# Running", cmd) + exitcode, output = run(cmd, wd, options, replacements, env) + # do not merge output if skipped, return hghave message instead + # similarly, with --debug, output is None + if exitcode == SKIPPED_STATUS or output is None: + return exitcode, output # Merge the script output back into a unified test