summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMike Pennisi <mike@mikepennisi.com>2016-02-19 10:46:17 -0500
committerMike Pennisi <mike@mikepennisi.com>2016-02-19 10:46:17 -0500
commit4dd257d7e676d22c3d8a7faa7d041af0839b5d84 (patch)
tree5cbed82c897cf999ed0c435105625595a9514b9f /tools
parentccf0adfc62e23c7ded83dd86c822027495de3798 (diff)
downloadqtdeclarative-testsuites-4dd257d7e676d22c3d8a7faa7d041af0839b5d84.tar.gz
Revert "Test runner: Avoid race condition"
This reverts commit 217812891cd63c20b25379b2cf73f3101416ffe4.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/packaging/test262.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/packaging/test262.py b/tools/packaging/test262.py
index 26f3f8b52..1192005fc 100755
--- a/tools/packaging/test262.py
+++ b/tools/packaging/test262.py
@@ -583,7 +583,6 @@ class TestSuite(object):
SkipCaseElement.append(SkipElement)
TestSuiteElement.append(SkipCaseElement)
- threads = []
if workers_count > 1:
pool_sem = threading.Semaphore(workers_count)
log_lock = threading.Lock()
@@ -614,13 +613,11 @@ class TestSuite(object):
exec_case()
else:
pool_sem.acquire()
- thread = threading.Thread(target=exec_case)
- threads.append(thread)
- thread.start()
+ threading.Thread(target=exec_case).start()
pool_sem.release()
- for thread in threads:
- thread.join()
+ if workers_count > 1:
+ log_lock.acquire()
if print_summary:
self.PrintSummary(progress, logname)
@@ -631,6 +628,9 @@ class TestSuite(object):
print "Use --full-summary to see output from failed tests"
print
+ if workers_count > 1:
+ log_lock.release()
+
return progress.failed
def WriteLog(self, result):