diff options
| author | lianah <lianahady@gmail.com> | 2013-11-05 20:03:49 -0500 |
|---|---|---|
| committer | lianah <lianahady@gmail.com> | 2013-11-05 20:03:49 -0500 |
| commit | ad0f78965f23b0994cac6a210650697b9a20cceb (patch) | |
| tree | b28418322c642ecf7f3d47ba356c4026c4ece4be /test/regress/run_regression | |
| parent | 347ac2260da73297776c547f7397b33beb59cf2b (diff) | |
fixed proof regression script and added a new uf test case
Diffstat (limited to 'test/regress/run_regression')
| -rwxr-xr-x | test/regress/run_regression | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/test/regress/run_regression b/test/regress/run_regression index e9c17a3af..44517cc0c 100755 --- a/test/regress/run_regression +++ b/test/regress/run_regression @@ -112,7 +112,7 @@ elif expr "$benchmark" : '.*\.smt2$' &>/dev/null; then proof_command='(get-proof)' lang=smt2 if test -e "$benchmark.expect"; then - expected_proof=`grep '^% PROOF' "$benchmark.expect" &>/dev/null && echo yes` + expected_proof=`grep '^[%;] PROOF' "$benchmark.expect" &>/dev/null && echo yes` expected_output=`grep '^% EXPECT: ' "$benchmark.expect" | sed 's,^% EXPECT: ,,'` expected_error=`grep '^% EXPECT-ERROR: ' "$benchmark.expect" | sed 's,^% EXPECT-ERROR: ,,'` expected_exit_status=`grep -m 1 '^% EXIT: ' "$benchmark.expect" | perl -pe 's,^% EXIT: ,,;s,\r,,'` @@ -140,7 +140,7 @@ elif expr "$benchmark" : '.*\.smt2$' &>/dev/null; then expected_exit_status=10 command_line= elif grep '^ *( *set-info *:status *unsat' "$benchmark" &>/dev/null; then - expected_proof= + expected_proof=`grep '^; PROOF' "$benchmark" &>/dev/null && echo yes` expected_output=unsat expected_exit_status=20 command_line= @@ -276,8 +276,15 @@ fi if [ "$proof" = yes -a "$expected_proof" = yes ]; then gettemp pfbenchmark cvc4_pfbenchmark.$$.XXXXXXXXXX - cp "$benchmark" "$pfbenchmark"; - echo "$proof_command" >>"$pfbenchmark"; + # remove exit command to add proof command for smt2 benchmarks + if expr "$benchmark" : '.*\.smt2$' &>/dev/null; then + head -n -0 "$benchmark" > "$pfbenchmark"; + echo "$proof_command" >>"$pfbenchmark"; + echo "(exit)" >> "$pfbenchmark"; + else + cp $benchmark $pfbenchmark + echo "$proof_command" >>"$pfbenchmark"; + fi echo running $wrapper $cvc4full $CVC4_REGRESSION_ARGS $command_line --proof --segv-nospin `basename "$pfbenchmark"` [from working dir `dirname "$pfbenchmark"`] time ( :; \ ( cd `dirname "$pfbenchmark"`; @@ -286,6 +293,7 @@ if [ "$proof" = yes -a "$expected_proof" = yes ]; then ) > "$outfile" 2> "$errfile" ) gettemp pfoutfile cvc4_proof.$$.XXXXXXXXXX + diff --unchanged-group-format='' \ --old-group-format='' \ --new-group-format='%>' \ |