- update minidump database

- improve output formatting for run.py

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@965 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2011-04-22 17:15:33 +00:00
parent 7807c15e65
commit 3ac2f700dd
3 changed files with 13 additions and 6 deletions

Binary file not shown.

View File

@ -92,6 +92,10 @@ def process_dir(d, outfile, file_filter):
outfile.flush() outfile.flush()
if subprocess.call(cmd, stdout=outfile, stderr=outfile, shell=False): if subprocess.call(cmd, stdout=outfile, stderr=outfile, shell=False):
print("Failure processing " + fullp) print("Failure processing " + fullp)
# spit out an empty file to indicate that this failure is expected
with open(outf,'wb') as f:
pass
return num return num

View File

@ -124,8 +124,8 @@ class results:
def report_results(self): def report_results(self):
"""Write results to ../results/run_regression_suite_failures.txt""" """Write results to ../results/run_regression_suite_failures.txt"""
print("\n" + ('='*60) + "\n" + "SUCCESS: {0}\r\nFAILURE: {1}".format( print("\n" + ('='*60) + "\n" + "SUCCESS: {0}\nFAILURE: {1}\nPercentage good: {2}".format(
len(self.success), len(self.failures)) + len(self.success), len(self.failures), len(self.success)/(len(self.success)+len(self.failures)) ) +
"\n" + ('='*60) + "\n") "\n" + ('='*60) + "\n")
with open(os.path.join('..', 'results',outfilename_failur), "wt") as f: with open(os.path.join('..', 'results',outfilename_failur), "wt") as f:
@ -185,15 +185,18 @@ def process_dir(d, outfile_results, zipin, result):
if r and not failure: if r and not failure:
result.fail(fullpath, outfile_expect, pppreset, IMPORT_FAILURE, r) result.fail(fullpath, outfile_expect, pppreset, IMPORT_FAILURE, r)
continue continue
elif failure: elif failure and not r:
result.fail(fullpath, outfile_expect, pppreset, EXPECTED_FAILURE_NOT_MET) result.fail(fullpath, outfile_expect, pppreset, EXPECTED_FAILURE_NOT_MET)
continue continue
with open(outfile_expect, "wb") as s: with open(outfile_expect, "wb") as s:
s.write(input_expected) s.write(input_expected)
with open(outfile_actual, "rb") as s: try:
input_actual = s.read() with open(outfile_actual, "rb") as s:
input_actual = s.read()
except IOError:
continue
if len(input_expected) != len(input_actual): if len(input_expected) != len(input_actual):
result.fail(fullpath, outfile_expect, pppreset, DATABASE_LENGTH_MISMATCH, result.fail(fullpath, outfile_expect, pppreset, DATABASE_LENGTH_MISMATCH,