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

run_tests.py more compatible with python 3.x

Browse Source 
except for the mutex class...
This commit is contained in:
Jean-Luc Duprat
2012-01-10 13:12:38 -08:00
parent fa01b63fa5
commit ef05fbf424
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
run_tests.py
View File

@@ -51,13 +51,13 @@ else:
is_generic_target = options.target.find("generic-") != -1 is_generic_target = options.target.find("generic-") != -1
if is_generic_target and options.include_file == None: if is_generic_target and options.include_file == None:
if options.target == "generic-4": if options.target == "generic-4":
print "No generics #include specified; using examples/intrinsics/sse4.h" sys.stderr.write("No generics #include specified; using examples/intrinsics/sse4.h")
options.include_file = "examples/intrinsics/sse4.h" options.include_file = "examples/intrinsics/sse4.h"
elif options.target == "generic-8": elif options.target == "generic-8":
print "No generics #include specified and no default available for \"generic-8\" target."; sys.stderr.write("No generics #include specified and no default available for \"generic-8\" target.")
sys.exit(1) sys.exit(1)
elif options.target == "generic-16": elif options.target == "generic-16":
print "No generics #include specified; using examples/intrinsics/generic-16.h" sys.stderr.write("No generics #include specified; using examples/intrinsics/generic-16.h")
options.include_file = "examples/intrinsics/generic-16.h" options.include_file = "examples/intrinsics/generic-16.h"
if options.compiler_exe == None: if options.compiler_exe == None:
@@ -107,7 +107,7 @@ def update_progress(fn):
def run_command(cmd): def run_command(cmd):
if options.verbose: if options.verbose:
print "Running: %s" % cmd sys.stdout.write("Running: %s" % cmd)
sp = subprocess.Popen(shlex.split(cmd), stdin=None, sp = subprocess.Popen(shlex.split(cmd), stdin=None,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
@@ -123,9 +123,9 @@ def run_cmds(compile_cmds, run_cmd, filename, expect_failure):
(return_code, output) = run_command(cmd) (return_code, output) = run_command(cmd)
compile_failed = (return_code != 0) compile_failed = (return_code != 0)
if compile_failed: if compile_failed:
print "Compilation of test %s failed " % filename sys.stdout.write("Compilation of test %s failed " % filename)
if output != "": if output != "":
print "%s" % output sys.stdout.write("%s" % output)
return (1, 0) return (1, 0)
(return_code, output) = run_command(run_cmd) (return_code, output) = run_command(run_cmd)
@@ -134,11 +134,11 @@ def run_cmds(compile_cmds, run_cmd, filename, expect_failure):
surprise = ((expect_failure and not run_failed) or surprise = ((expect_failure and not run_failed) or
(not expect_failure and run_failed)) (not expect_failure and run_failed))
if surprise == True: if surprise == True:
print "Test %s %s (return code %d) " % \ sys.stdout.write("Test %s %s (return code %d) " % \
(filename, "unexpectedly passed" if expect_failure else "failed", (filename, "unexpectedly passed" if expect_failure else "failed",
return_code) return_code))
if output != "": if output != "":
print "%s" % output sys.stdout.write("%s" % output)
if surprise == True: if surprise == True:
return (0, 1) return (0, 1)
else: else:
@@ -163,12 +163,12 @@ def run_test(filename):
file.close() file.close()
if (output.find(firstline) == -1): if (output.find(firstline) == -1):
print "OUT %s" % filename sys.stderr.write("OUT %s" % filename)
print "Didnt see expected error message %s from test %s.\nActual output:\n%s" % \ sys.stderr.write("Didnt see expected error message %s from test %s.\nActual output:\n%s" % \
(firstline, filename, output) (firstline, filename, output))
return (1, 0) return (1, 0)
elif got_error == False: elif got_error == False:
print "Unexpectedly no errors issued from test %s" % filename sys.stderr.write("Unexpectedly no errors issued from test %s" % filename)
return (1, 0) return (1, 0)
else: else:
return (0, 0) return (0, 0)
@@ -194,8 +194,8 @@ def run_test(filename):
break break
file.close() file.close()
if match == -1: if match == -1:
print "Fatal error: unable to find function signature " + \ sys.stderr.write("Fatal error: unable to find function signature " + \
"in test %s" % filename "in test %s" % filename)
return (1, 0) return (1, 0)
else: else:
is_generic_target = options.target.find("generic-") != -1 is_generic_target = options.target.find("generic-") != -1
@@ -296,7 +296,7 @@ if __name__ == '__main__':
# exe in the end. So run serially. :-( # exe in the end. So run serially. :-(
nthreads = 1 nthreads = 1
num_done = 0 num_done = 0
print "Running %d tests." % (total_tests) sys.stdout.write("Running %d tests." % (total_tests))
for fn in files: for fn in files:
(compile_error, run_error) = run_test(fn) (compile_error, run_error) = run_test(fn)
if compile_error != 0: if compile_error != 0:
@@ -314,7 +314,7 @@ if __name__ == '__main__':
sys.stdout.flush() sys.stdout.flush()
else: else:
nthreads = multiprocessing.cpu_count() nthreads = multiprocessing.cpu_count()
print "Found %d CPUs. Running %d tests." % (nthreads, total_tests) sys.stdout.write("Found %d CPUs. Running %d tests." % (nthreads, total_tests))
# put each of the test filenames into a queue # put each of the test filenames into a queue
q = multiprocessing.Queue() q = multiprocessing.Queue()
@@ -338,7 +338,7 @@ if __name__ == '__main__':
# (i.e. return 0 if all is ok) # (i.e. return 0 if all is ok)
for t in task_threads: for t in task_threads:
t.join() t.join()
print sys.stdout.write("\n")
while not qret.empty(): while not qret.empty():
(c, r) = qret.get() (c, r) = qret.get()
@@ -347,13 +347,13 @@ if __name__ == '__main__':
if len(compile_error_files) > 0: if len(compile_error_files) > 0:
compile_error_files.sort() compile_error_files.sort()
print "%d / %d tests FAILED compilation:" % (len(compile_error_files), total_tests) sys.stdout.write("%d / %d tests FAILED compilation:" % (len(compile_error_files), total_tests))
for f in compile_error_files: for f in compile_error_files:
print "\t%s" % f sys.stdout.write("\t%s" % f)
if len(run_error_files) > 0: if len(run_error_files) > 0:
run_error_files.sort() run_error_files.sort()
print "%d / %d tests FAILED execution:" % (len(run_error_files), total_tests) sys.stdout.write("%d / %d tests FAILED execution:" % (len(run_error_files), total_tests))
for f in run_error_files: for f in run_error_files:
print "\t%s" % f sys.stdout.write("\t%s" % f)
sys.exit(len(compile_error_files) + len(run_error_files)) sys.exit(len(compile_error_files) + len(run_error_files))