merge with master

2014-02-01 11:53:57 +01:00
parent 0c47a902f5 93cf02842c
commit 6bf2ad27d1
5 changed files with 250 additions and 209 deletions
--- a/run_tests.py
+++ b/run_tests.py
@@ -324,6 +324,8 @@ def run_tasks_from_queue(queue, queue_ret, queue_skip, total_tests_arg, max_test

    if is_windows:
        tmpdir = "tmp%d" % os.getpid()
+        while os.access(tmpdir, os.F_OK):
+            tmpdir = "%sx" % tmpdir
        os.mkdir(tmpdir)
        os.chdir(tmpdir)
    else: