diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-08-16 15:04:14 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-09-13 19:21:13 -0400 |
| commit | 24b4ca565400d64b82626484044f72fd024477cd (patch) | |
| tree | 0f35b74427607bf5f6d97ec3f0f109182be022fd /test/regress/run_regression | |
| parent | 14776d0aeb833a7e728a27af6ef545f20b495f7f (diff) | |
Move some regress benchmarks around that took too long, other test cleanup.
Diffstat (limited to 'test/regress/run_regression')
| -rwxr-xr-x | test/regress/run_regression | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/regress/run_regression b/test/regress/run_regression index a67496514..e9c17a3af 100755 --- a/test/regress/run_regression +++ b/test/regress/run_regression @@ -237,16 +237,18 @@ cvc4base=`basename "$cvc4"` cvc4full="$cvc4dirfull/$cvc4base" if [ $dump = no ]; then echo running $wrapper $cvc4full $CVC4_REGRESSION_ARGS $command_line --segv-nospin `basename "$benchmark"` [from working dir `dirname "$benchmark"`] + time ( :; \ ( cd `dirname "$benchmark"`; $wrapper "$cvc4full" $CVC4_REGRESSION_ARGS $command_line --segv-nospin `basename "$benchmark"`; echo $? >"$exitstatusfile" - ) > "$outfile" 2> "$errfile" + ) > "$outfile" 2> "$errfile" ) else echo running $wrapper $cvc4full $CVC4_REGRESSION_ARGS $command_line --preprocess-only --dump=clauses --output-lang=smt2 -q --segv-nospin `basename "$benchmark"` \| $wrapper $cvc4full $CVC4_REGRESSION_ARGS $command_line --lang=smt2 - [from working dir `dirname "$benchmark"`] + time ( :; \ ( cd `dirname "$benchmark"`; $wrapper "$cvc4full" $CVC4_REGRESSION_ARGS $command_line --preprocess-only --dump=clauses --output-lang=smt2 -q --segv-nospin `basename "$benchmark"` | $wrapper "$cvc4full" $CVC4_REGRESSION_ARGS $command_line --lang=smt2 -; echo $? >"$exitstatusfile" - ) > "$outfile" 2> "$errfile" + ) > "$outfile" 2> "$errfile" ) fi diffs=`diff -u --strip-trailing-cr "$expoutfile" "$outfile"` @@ -277,10 +279,11 @@ if [ "$proof" = yes -a "$expected_proof" = yes ]; then cp "$benchmark" "$pfbenchmark"; echo "$proof_command" >>"$pfbenchmark"; echo running $wrapper $cvc4full $CVC4_REGRESSION_ARGS $command_line --proof --segv-nospin `basename "$pfbenchmark"` [from working dir `dirname "$pfbenchmark"`] + time ( :; \ ( cd `dirname "$pfbenchmark"`; $wrapper "$cvc4full" $CVC4_REGRESSION_ARGS $command_line --proof --segv-nospin `basename "$pfbenchmark"`; echo $? >"$exitstatusfile" - ) > "$outfile" 2> "$errfile" + ) > "$outfile" 2> "$errfile" ) gettemp pfoutfile cvc4_proof.$$.XXXXXXXXXX diff --unchanged-group-format='' \ |