Dave Parker
d08a8d4c33
prism-auto fix: when checking output files in test mode, fail immediately when the first one is different.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11983 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
751e95fa42
Small fix in prism-auto: make sure directory is passed to bench to benchmark function in "build" mode, in particular so that log names are created consisently. (Reported by Steffen Marcker).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11964 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
1e5d779cb3
prism-auto: In test mode, cleanup the temporary files used for capturing PRISM output
Due to the use of NamedTemporaryFile(delete=False) we actually have to
delete the log files ourselves.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11881 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b203d6438d
prism-auto: Use line ending agnostic file compare
The previously used filecmp.cmp opens the files to be compared in 'rb'
mode, i.e., it will tell us that two files that differ only in the
line-ending encoding (CRLF vs LF) are not equivalent. However, we'd
like to get the export tests to succeed on Windows, regardless of the
line endings. So, we provide our own file comparison method that opens
the file in 'rU' mode (universal newline mode), which converts all the
newline encodings to '\n' transparently.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11880 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
fe533db326
prism-auto: Fix test-mode on Windows
Somehow, PRISM can not open a NamedTemporaryFile created on Windows
(see issue prismmodelchecker/prism#11 ) when passed the filename via
the -mainlog parameter.
So, on Windows, we fall back on the old method of capturing stdout
directly via the Popen call. As this does not work with nailgun (the
C printfs go to the nailgun server stdout), we currently don't allow
nailgun use on Windows.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11879 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
eb5028dbf8
prism-auto: add --dd-warnings mode for printing the CUDD reference leak warnings
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11812 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
0f9dfe0275
prism-auto: Make sure nailgun is closed down if the script ends with an error (and refactor the exit code).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11743 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
2a38cf110b
prism-auto: Don't actually execute nailgun commands in echo mode - just print them.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11742 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
2ff89c09a4
prism-auto: color 'NOT TESTED' test result just like 'SKIPPED'
NOT TESTED is the result of a // RESULT: ? line in a property file
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11599 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
79e5f3b68d
prism-auto: don't expand to filename for exports if 'stdout'
PRISM recognizes the filename 'stdout' as special and exports
to standard output, so prepending a directory by prism-auto
does not make sense.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11592 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e838330aae
reapply previous commit (prepare prism-auto for python3 compatibility)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11158 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
e18c7362be
temporarily reverting previous commit (to figure out some Jenkins build stuff)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11157 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
4b711fe98a
prism-auto: add parentheses for print call to make script compatible with python3
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11155 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b6828a7045
Remove unused "techLog" from Prism object and other classes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11078 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b7a034bb85
Remove changes accidentally commited in rev 10595.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10599 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0f9e001645
Bug fix in CNF conversion (from Yuyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10595 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
5156f2d9c5
Fix in previous improvement to prism-auto.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10594 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
33e745af83
prism-auto: Location of ngprism can optionally be specified with --ngprism.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10593 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
6dd6628f52
Preliminary Nailgun support for prism-auto (add --nailgun).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10592 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
3da87f5bf5
prism-auto: support multiple -x arguments
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10570 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f601843c59
prism-auto bug fix (crashes when run on a single model in build mode).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10491 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
264ee2c080
prism-auto: revert previous commit, can not pass arguments to python when using env
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10444 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Joachim Klein
a0f45900be
prism-auto: use -u switch to set stdout/stderr to unbuffered
As a side-effect, this sets stdout/stderr to 'binary', which might
make a difference on Windows...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10442 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
500147ede4
prism-auto: Add -w/--show-warnings switch to show warnings (as well as errors) when in test mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10309 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b5320f599d
prism-auto: Redirect PRISM techLog as well as mainLog (e.g. for CUDD warnings) when in test mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10308 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c456da3455
prism-auto: Use -mainlog switch for redirecting output in test/log modes (mainly because this works better with Nailgun).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10303 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f927684aba
prism-auto: --help tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10257 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
952e550be7
prism-auto: Colour coding can be switched on/off with --colour switch (yes,no,auto).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10256 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
308ee00e64
prism-auto: Commenting
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10255 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8aa9d24f5d
Colour code test results from prism-auto script.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10251 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
72cc161436
prism-auto: Also skip the export tests when the file is missing. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10221 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
48833263ea
prism-auto: --no-export-tests switch to skip export tests in test mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10181 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0bf0e07bee
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
11 years ago
Dave Parker
04673cdd23
prism-auto: More debugging
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10125 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c4deebb663
prism-auto: Rename .test files as .auto files.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10124 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
244ca04d6c
prism-auto: display diff command when export test fails.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10107 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5942b9e977
prism-auto bugfix (when calling on a properties file).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10091 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c8951a634a
prism-auto patch: Make name of "models" file configurable. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10090 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
abcb948d6f
prism-auto patch: make sure directories are traversed in a predictable order. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10089 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
28cf06cd57
prism-auto: Revert -e/--echo switch to old behaviour and add --echo-full for extended functionality from Joachim Klein.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10045 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f7f7e736d2
prism-auto: Fix some bugs and document more of the functions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10044 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f1d6d850ce
Fix in prism-auto
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10000 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
fb7208d792
Improved "echo" (-e) functionality for prism-auto: displays more accurately what prism-auto would do, including test (-t) and log (-l) modes [from Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9997 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c0cd3810f2
prism-auto bugfix: something got broken for processing property files during recent refactoring.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9996 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
87ad5c37b7
Remove typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9995 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8b062cf410
prism-auto can take multiple files/dirs as arguments.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9991 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
640101bdcc
Improved detection of export files detected by prism-auto.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9990 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
3c17f39e18
prism-auto: Remove debug output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9983 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
46e7e979e8
prism-auto: Some improvements in detection of export files.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9982 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
3ca0c4fb81
prism-auto: Print error if file/dir does not exist
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9981 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago