From 0bf0e07beec44b5c1737520a09ed0b4cfa2c50f1 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 29 Jun 2015 22:21:47 +0000 Subject: [PATCH] prism-auto fix: .args files should be read for .auto files too. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10126 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/etc/scripts/prism-auto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/prism/etc/scripts/prism-auto b/prism/etc/scripts/prism-auto index 57c7e12f..fd6ff55a 100755 --- a/prism/etc/scripts/prism-auto +++ b/prism/etc/scripts/prism-auto @@ -497,7 +497,8 @@ def benchmarkModelFile(modelFile, modelArgs=[], dir=""): for autoFile in autoFiles: logging.debug("Auto file: " + str(autoFile)) for autoArgs in getArgsListsFromFile(autoFile): - benchmark(modelFile, modelArgs + args + autoArgs, dir) + for argsa in getMatchingArgListsForFile(autoFile): + benchmark(modelFile, modelArgs + args + autoArgs + argsa, dir) # Execute benchmarking on an auto file, i.e. a file containing one or more lines # of command-line arguments specifying calls to be made to PRISM. @@ -522,7 +523,8 @@ def benchmarkAutoFile(autoFile): # Treat auto file like an args file for argsList in getArgsListsFromFile(autoFile): # Don't look for properties (corresponds to build mode) - benchmark(modelFile, modelArgs + argsList, dir) + for argsa in getMatchingArgListsForFile(autoFile): + benchmark(modelFile, modelArgs + argsList + argsa, dir) if not modelFiles: # There aren't any (matching) model files, process as "orphaned" auto file for argsList in getArgsListsFromFile(autoFile):