test: comparison tests/run-tests.py

equal deleted inserted replaced

-:6f25a5834e14
+:3881911c17b0
 import tempfile
 import time
 import re
 import threading
+processlock = threading.Lock()
 closefds = os.name == 'posix'
-def Popen4(cmd, timeout):
+def Popen4(cmd, wd, timeout):
+processlock.acquire()
+orig = os.getcwd()
+os.chdir(wd)
 p = subprocess.Popen(cmd, shell=True, bufsize=-1,
 close_fds=closefds,
 stdin=subprocess.PIPE, stdout=subprocess.PIPE,
 stderr=subprocess.STDOUT)
+os.chdir(orig)
+processlock.release()
 p.fromchild = p.stdout
 p.tochild = p.stdin
 p.childerr = p.stderr
 if timeout:
 if options.jobs > 1 or options.child is not None:
 pid = "[%d]" % os.getpid()
 else:
 pid = None
 def vlog(*msg):
+iolock.acquire()
 if pid:
 print pid,
 for m in msg:
 print m,
 print
 sys.stdout.flush()
+iolock.release()
 else:
 vlog = lambda *msg: None
 if options.tmpdir:
 options.tmpdir = os.path.expanduser(options.tmpdir)
 adir = os.path.join(TESTDIR, 'annotated')
 if not os.path.isdir(adir):
 os.mkdir(adir)
 covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)
-def pytest(test, options, replacements):
+def pytest(test, wd, options, replacements):
 py3kswitch = options.py3k_warnings and ' -3' or ''
 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
 vlog("# Running", cmd)
-return run(cmd, options, replacements)
+return run(cmd, wd, options, replacements)
-def shtest(test, options, replacements):
+def shtest(test, wd, options, replacements):
 cmd = '"%s"' % test
 vlog("# Running", cmd)
-return run(cmd, options, replacements)
+return run(cmd, wd, options, replacements)
 needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
 escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
 escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
 escapemap.update({'\\': '\\\\', '\r': r'\r'})
 def escapef(m):
 return escapemap[m.group(0)]
 def stringescape(s):
 return escapesub(escapef, s)
-def tsttest(test, options, replacements):
+def tsttest(test, wd, options, replacements):
 t = open(test)
 out = []
 script = []
 salt = "SALT" + str(time.time())
 os.write(fd, l)
 os.close(fd)
 cmd = '/bin/sh "%s"' % name
 vlog("# Running", cmd)
-exitcode, output = run(cmd, options, replacements)
+exitcode, output = run(cmd, wd, options, replacements)
 # 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:
 postout += after.pop(pos)
 return exitcode, postout
 wifexited = getattr(os, "WIFEXITED", lambda x: False)
-def run(cmd, options, replacements):
+def run(cmd, wd, options, replacements):
 """Run command in a sub-process, capturing the output (stdout and stderr).
 Return a tuple (exitcode, output).  output is None in debug mode."""
 # TODO: Use subprocess.Popen if we're running on Python 2.4
 if options.debug:
 proc = subprocess.Popen(cmd, shell=True)
 output = fromchild.read()
 ret = fromchild.close()
 if ret is None:
 ret = 0
 else:
-proc = Popen4(cmd, options.timeout)
+proc = Popen4(cmd, wd, options.timeout)
 def cleanup():
 try:
 proc.terminate()
 except OSError:
 pass
 # Make a tmp subdirectory to work in
 testtmp = os.environ["TESTTMP"] = os.environ["HOME"] = \
 os.path.join(HGTMP, test)
 os.mkdir(testtmp)
-os.chdir(testtmp)
+ret, out = runner(testpath, testtmp, options, [
-ret, out = runner(testpath, options, [
 (re.escape(testtmp), '$TESTTMP'),
 (r':%s\b' % options.port, ':$HGPORT'),
 (r':%s\b' % (options.port + 1), ':$HGPORT1'),
 (r':%s\b' % (options.port + 2), ':$HGPORT2'),
 ])
 sys.stdout.flush()
 iolock.release()
 killdaemons()
-os.chdir(TESTDIR)
 if not options.keep_tmpdir:
 shutil.rmtree(testtmp, True)
 if skipped:
 return None
 return ret == 0

changeset 920	3881911c17b0
parent 919	1666a4a68262
child 921	abb2a67ce631