Browse Source

Add --test-all option to prism-auto script.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4923 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
c8aa09eef2
  1. 10
      prism/etc/scripts/prism-auto

10
prism/etc/scripts/prism-auto

@ -201,7 +201,8 @@ def walk(dir, meth):
def runPrism(args, dir=""): def runPrism(args, dir=""):
if options.test: if options.test:
args.append("-test")
if options.testAll: args.append("-testall")
else: args.append("-test")
if options.echo: if options.echo:
print ' '.join(args) print ' '.join(args)
return return
@ -229,8 +230,10 @@ def runPrism(args, dir=""):
for line in open(logFile, 'r').readlines(): for line in open(logFile, 'r').readlines():
if re.match('Error:', line): if re.match('Error:', line):
print line, print line,
print "Log file: " + logFile
sys.exit(1)
print "To see log file, run:"
print "cat " + logFile
if not options.testAll:
sys.exit(1)
# Run a benchmark, specified by a list of command-line args, # Run a benchmark, specified by a list of command-line args,
# possibly iterating over further lists of args from a "bm" file # possibly iterating over further lists of args from a "bm" file
@ -346,6 +349,7 @@ parser.add_option("-p", "--prog", dest="prismExec", metavar="FILE", default="pri
parser.add_option("-n", "--non-recursive", action="store_true", dest="nonRec", default=False, help="Don't recurse into directories") parser.add_option("-n", "--non-recursive", action="store_true", dest="nonRec", default=False, help="Don't recurse into directories")
parser.add_option("-x", "--extra", dest="extraArgs", metavar="XXX", default="", help="Pass (single string of) extra switches to PRISM") parser.add_option("-x", "--extra", dest="extraArgs", metavar="XXX", default="", help="Pass (single string of) extra switches to PRISM")
parser.add_option("-t", "--test", action="store_true", dest="test", default=False, help="Run in test mode") parser.add_option("-t", "--test", action="store_true", dest="test", default=False, help="Run in test mode")
parser.add_option("--test-all", action="store_true", dest="testAll", default=False, help="In test mode, don't stop after an error")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if len(args) != 1: if len(args) != 1:
parser.print_help() parser.print_help()

Loading…
Cancel
Save