aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass total number of tests as expicit parameter to subprocesses, so it works on Windows

Browse Source
This commit is contained in:
Dmitry Babokin
2013-04-23 23:47:21 +02:00
parent 6f42bfc640
commit 8fea85a85c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
run_tests.py
View File

@@ -148,10 +148,9 @@ finished_tests_counter_lock = multiprocessing.Lock()
# utility routine to print an update on the number of tests that have been # utility routine to print an update on the number of tests that have been
# finished. Should be called with the lock held.. # finished. Should be called with the lock held..
def update_progress(fn): def update_progress(fn, total_tests_argument):
global total_tests
finished_tests_counter.value = finished_tests_counter.value + 1 finished_tests_counter.value = finished_tests_counter.value + 1
progress_str = " Done %d / %d [%s]" % (finished_tests_counter.value, total_tests, fn) progress_str = " Done %d / %d [%s]" % (finished_tests_counter.value, total_tests_argument, fn)
# spaces to clear out detrius from previous printing... # spaces to clear out detrius from previous printing...
for x in range(30): for x in range(30):
progress_str += ' ' progress_str += ' '
@@ -344,7 +343,7 @@ def run_test(testname):
# pull tests to run from the given queue and run them. Multiple copies of # pull tests to run from the given queue and run them. Multiple copies of
# this function will be running in parallel across all of the CPU cores of # this function will be running in parallel across all of the CPU cores of
# the system. # the system.
def run_tasks_from_queue(queue, queue_ret): def run_tasks_from_queue(queue, queue_ret, total_tests_argument):
if is_windows: if is_windows:
tmpdir = "tmp%d" % os.getpid() tmpdir = "tmp%d" % os.getpid()
os.mkdir(tmpdir) os.mkdir(tmpdir)
@@ -376,7 +375,7 @@ def run_tasks_from_queue(queue, queue_ret):
run_error_files += [ filename ] run_error_files += [ filename ]
with finished_tests_counter_lock: with finished_tests_counter_lock:
update_progress(filename) update_progress(filename, total_tests_argument)
task_threads = [] task_threads = []
@@ -408,7 +407,7 @@ if __name__ == '__main__':
# launch jobs to run tests # launch jobs to run tests
for x in range(nthreads): for x in range(nthreads):
t = multiprocessing.Process(target=run_tasks_from_queue, args=(q,qret)) t = multiprocessing.Process(target=run_tasks_from_queue, args=(q,qret,total_tests))
task_threads.append(t) task_threads.append(t)
t.start() t.start()