Browse Source

Unbreak prism-auto (after previous refactoring).

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9975 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 11 years ago
parent
commit
c561f38c75
  1. 9
      prism/etc/scripts/prism-auto

9
prism/etc/scripts/prism-auto

@ -343,6 +343,10 @@ def benchmark(file, args, dir=""):
# Expand output files to full paths # Expand output files to full paths
args = expandFilenames(args, dir) args = expandFilenames(args, dir)
# Determine which out files apply to this benchmark from the -export switches (if required)
if not options.echo and options.test:
outFiles = getExpectedOutFilesFromArgs(args)
# Rename export files to avoid overriding out files # Rename export files to avoid overriding out files
# (if in test mode, and if not disabled) # (if in test mode, and if not disabled)
exportPrefix = 'tmp.' exportPrefix = 'tmp.'
@ -367,10 +371,7 @@ def benchmark(file, args, dir=""):
runPrism(modelFileArg + args, dir) runPrism(modelFileArg + args, dir)
# Verify that exported files are correct (if required) # Verify that exported files are correct (if required)
if not options.echo and options.test:
# Determine which out files apply to this benchmark from the -export switches
outFiles = getExpectedOutFilesFromArgs(args)
if outFiles:
if not options.echo and options.test and outFiles:
# print "Out files to verify exports against: " + ' '.join(outFiles) # print "Out files to verify exports against: " + ' '.join(outFiles)
allEqual = verifyAndCleanupExports(outFiles, exportPrefix) allEqual = verifyAndCleanupExports(outFiles, exportPrefix)
if (not allEqual) and (not options.testAll): if (not allEqual) and (not options.testAll):

Loading…
Cancel
Save