From 6cbb69f72f550a25e1784451fdb2404361ac4018 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 9 Jun 2015 23:25:15 +0000 Subject: [PATCH] Update error messages in prism-auto for export checking. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9966 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/etc/scripts/prism-auto | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/prism/etc/scripts/prism-auto b/prism/etc/scripts/prism-auto index a1e3e611..08160402 100755 --- a/prism/etc/scripts/prism-auto +++ b/prism/etc/scripts/prism-auto @@ -318,17 +318,19 @@ def verifyAndCleanupExports(outFiles, exportPrefix): result = True # Check for equality with out files for outFile in outFiles: + print "Testing export " + os.path.basename(outFile) + ":", expFile = prependToFile(exportPrefix, outFile) - if os.path.isfile(expFile) and filecmp.cmp(outFile, expFile): - # If successful, notify and delete exported file - print "Testing result (" + os.path.basename(outFile) + "): PASS" - os.remove(expFile) + if os.path.isfile(expFile): + if filecmp.cmp(outFile, expFile): + # If successful, notify and delete exported file + print "PASS" + os.remove(expFile) + else: + print "FAIL (" + os.path.basename(expFile) + " does not match)" + result = False else: - # No .out file matches exported files, report error - #newName = file + ".fail" - #os.rename(file, newName) + print "FAIL (no " + os.path.basename(expFile) + " to compare to)" result = False - print "Error: No matching export for " + outFile return result # Run a benchmark, specified by a list of command-line args,