Mercurial > hg
changeset 10406:6586a6889f66
run-tests.py: skipped tests shouldn't change working directory
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 09 Feb 2010 01:12:29 +0100 |
| parents | 2d30d66a89ad |
| children | 2e8926e9cc32 |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Mon Feb 08 20:51:23 2010 +0100 +++ b/tests/run-tests.py Tue Feb 09 01:12:29 2010 +0100 @@ -522,18 +522,11 @@ hgrc.write('appendpid=True\n') hgrc.close() - err = os.path.join(TESTDIR, test+".err") + testpath = os.path.join(TESTDIR, test) ref = os.path.join(TESTDIR, test+".out") - testpath = os.path.join(TESTDIR, test) - + err = os.path.join(TESTDIR, test+".err") if os.path.exists(err): os.remove(err) # Remove any previous output files - - # Make a tmp subdirectory to work in - tmpd = os.path.join(HGTMP, test) - os.mkdir(tmpd) - os.chdir(tmpd) - try: tf = open(testpath) firstline = tf.readline().rstrip() @@ -563,6 +556,11 @@ return skip("not executable") cmd = '"%s"' % testpath + # Make a tmp subdirectory to work in + tmpd = os.path.join(HGTMP, test) + os.mkdir(tmpd) + os.chdir(tmpd) + if options.timeout > 0: signal.alarm(options.timeout)