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

fixed run_tests.py bug

Browse Source
This commit is contained in:
Anton Mitrokhin
2014-07-22 12:20:34 +04:00
parent a051c9bbd8
commit b6592c796d
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.py
View File

@@ -442,9 +442,9 @@ class ExecutionStateGatherer(object):
self.revision = "" self.revision = ""
self.rinf = [] self.rinf = []
self.tt = TestTable() self.tt = TestTable()
self.switch_revision("undefined")
def switch_revision(self, revision): def switch_revision(self, revision):
print "Switching revision to " + revision
self.revision = revision self.revision = revision
self.rinf.append(RevisionInfo(self.hostname, self.revision)) self.rinf.append(RevisionInfo(self.hostname, self.revision))

32
run_tests.py
View File

@@ -729,22 +729,28 @@ def run_tests(options1, args, print_version):
else: else:
opt = "-O2" opt = "-O2"
common.ex_state.add_to_rinf_testall(total_tests) try:
for fname in skip_files: common.ex_state.add_to_rinf_testall(total_tests)
# We do not add skipped tests to test table as we do not know the test result for fname in skip_files:
common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 0, 1) # We do not add skipped tests to test table as we do not know the test result
common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 0, 1)
for fname in compile_error_files: for fname in compile_error_files:
common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 1) common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 1)
common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 1, 0) common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 0, 1, 0)
for fname in run_error_files:
common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 1, 0)
common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 1, 0, 0)
for fname in run_succeed_files:
common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 0)
common.ex_state.add_to_rinf(options.arch, opt, options.target, 1, 0, 0, 0)
except:
print_debug("Exception in ex_state. Skipping...", s, run_tests_log)
for fname in run_error_files:
common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 1, 0)
common.ex_state.add_to_rinf(options.arch, opt, options.target, 0, 1, 0, 0)
for fname in run_succeed_files:
common.ex_state.add_to_tt(fname, options.arch, opt, options.target, 0, 0)
common.ex_state.add_to_rinf(options.arch, opt, options.target, 1, 0, 0, 0)
for jb in task_threads: for jb in task_threads:
if not jb.exitcode == 0: if not jb.exitcode == 0: