Remove support for *.expect files in regressions (#2341)
authorAndres Noetzli <andres.noetzli@gmail.com>
Tue, 21 Aug 2018 03:23:09 +0000 (20:23 -0700)
committerGitHub <noreply@github.com>
Tue, 21 Aug 2018 03:23:09 +0000 (20:23 -0700)
Currently, we can optionally specify an *.expect file with the metadata
of a regression test. This commit removes that option because it was not
widely used, adds maintenance overhead and makes the transition to a new
build system more cumbersome. Regression files can still be fed to a
solver without removing the metadata first since they are in comments of
the corresponding input format (note that this was not always the case,
it changed in efc6163629c6c5de446eccfe81777c93829995d5).

82 files changed:
test/regress/Makefile.am
test/regress/Makefile.tests
test/regress/README.md
test/regress/regress0/arith/miplib-opt1217--27.smt
test/regress/regress0/arith/miplib-opt1217--27.smt.expect [deleted file]
test/regress/regress0/arith/miplib-pp08a-3000.smt
test/regress/regress0/arith/miplib-pp08a-3000.smt.expect [deleted file]
test/regress/regress0/decision/aufbv-fuzz01.smt
test/regress/regress0/decision/aufbv-fuzz01.smt.expect [deleted file]
test/regress/regress0/decision/bitvec0.delta01.smt
test/regress/regress0/decision/bitvec0.delta01.smt.expect [deleted file]
test/regress/regress0/decision/bitvec0.smt
test/regress/regress0/decision/bitvec0.smt.expect [deleted file]
test/regress/regress0/decision/bitvec5.smt
test/regress/regress0/decision/bitvec5.smt.expect [deleted file]
test/regress/regress0/decision/bug347.smt
test/regress/regress0/decision/bug347.smt.expect [deleted file]
test/regress/regress0/decision/bug374a.smt
test/regress/regress0/decision/bug374a.smt.expect [deleted file]
test/regress/regress0/decision/bug374b.smt2
test/regress/regress0/decision/bug374b.smt2.expect [deleted file]
test/regress/regress0/decision/just_sat.expect [deleted file]
test/regress/regress0/decision/just_unsat.expect [deleted file]
test/regress/regress0/decision/pp-regfile.delta01.smt
test/regress/regress0/decision/pp-regfile.delta01.smt.expect [deleted file]
test/regress/regress0/decision/pp-regfile.delta02.smt
test/regress/regress0/decision/pp-regfile.delta02.smt.expect [deleted file]
test/regress/regress0/decision/quant-ex1.smt2
test/regress/regress0/decision/quant-ex1.smt2.expect [deleted file]
test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt
test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt.expect [deleted file]
test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.smt
test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.smt.expect [deleted file]
test/regress/regress0/decision/wchains010ue.delta02.smt
test/regress/regress0/decision/wchains010ue.delta02.smt.expect [deleted file]
test/regress/regress0/decision/wchains010ue.smt
test/regress/regress0/decision/wchains010ue.smt.expect [deleted file]
test/regress/regress0/expect/scrub.01.smt
test/regress/regress0/expect/scrub.01.smt.expect [deleted file]
test/regress/regress0/expect/scrub.03.smt2
test/regress/regress0/expect/scrub.03.smt2.expect [deleted file]
test/regress/regress0/quantifiers/bug291.smt2
test/regress/regress0/quantifiers/bug291.smt2.expect [deleted file]
test/regress/regress0/uflia/check02.smt2
test/regress/regress0/uflia/check02.smt2.expect [deleted file]
test/regress/regress0/uflia/check03.smt2
test/regress/regress0/uflia/check03.smt2.expect [deleted file]
test/regress/regress0/uflia/check04.smt2
test/regress/regress0/uflia/check04.smt2.expect [deleted file]
test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2
test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2.expect [deleted file]
test/regress/regress0/uflia/tiny.smt2
test/regress/regress0/uflia/tiny.smt2.expect [deleted file]
test/regress/regress1/bug216.smt2
test/regress/regress1/bug216.smt2.expect [deleted file]
test/regress/regress1/bug590.smt2
test/regress/regress1/bug590.smt2.expect [deleted file]
test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2
test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect [deleted file]
test/regress/regress1/decision/quant-symmetric_unsat_7.smt2
test/regress/regress1/decision/quant-symmetric_unsat_7.smt2.expect [deleted file]
test/regress/regress1/push-pop/bug216.smt2
test/regress/regress1/push-pop/bug216.smt2.expect [deleted file]
test/regress/regress1/simplification_bug4.smt2
test/regress/regress1/simplification_bug4.smt2.expect [deleted file]
test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2
test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect [deleted file]
test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2
test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect [deleted file]
test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2
test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect [deleted file]
test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2
test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect [deleted file]
test/regress/regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2
test/regress/regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2.expect [deleted file]
test/regress/regress2/uflia-error0.smt2
test/regress/regress2/uflia-error0.smt2.expect [deleted file]
test/regress/regress2/xs-09-16-3-4-1-5.decn.smt
test/regress/regress2/xs-09-16-3-4-1-5.decn.smt.expect [deleted file]
test/regress/regress3/pp-regfile.smt
test/regress/regress3/pp-regfile.smt.expect [deleted file]
test/regress/run_regression.py

index ba1442c69256d863885b02972da25715b3ca4aac..295335ed491eb1a74cab401a58a6de62fbd2dd1a 100644 (file)
@@ -49,7 +49,6 @@ EXTRA_DIST = \
   $(REG2_TESTS) \
   $(REG3_TESTS) \
   $(REG4_TESTS) \
-  $(TESTS_EXPECT) \
        regress0/uf/mkpidgeon \
        regress0/tptp/Axioms/BOO004-0.ax \
        regress0/tptp/Axioms/SYN000+0.ax \
index 383ee51623e59d0dfe0f4e1b8cf3cc7f0b65c1cc..08f64a92584c217ceafcb03419966a0f09d7c785 100644 (file)
@@ -2016,46 +2016,3 @@ DISABLED_TESTS = \
        regress2/quantifiers/small-bug1-fixpoint-3.smt2 \
        regress2/xs-11-20-5-2-5-3.smt \
        regress2/xs-11-20-5-2-5-3.smt2
-
-TESTS_EXPECT = \
-       regress0/arith/miplib-opt1217--27.smt.expect \
-       regress0/arith/miplib-pp08a-3000.smt.expect \
-       regress0/decision/aufbv-fuzz01.smt.expect \
-       regress0/decision/bitvec0.delta01.smt.expect \
-       regress0/decision/bitvec0.smt.expect \
-       regress0/decision/bitvec5.smt.expect \
-       regress0/decision/bug347.smt.expect \
-       regress0/decision/bug374a.smt.expect \
-       regress0/decision/bug374b.smt2.expect \
-       regress0/decision/just_sat.expect \
-       regress0/decision/just_unsat.expect \
-       regress0/decision/pp-regfile.delta01.smt.expect \
-       regress0/decision/pp-regfile.delta02.smt.expect \
-       regress0/decision/quant-ex1.smt2.expect \
-       regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt.expect \
-       regress0/decision/uflia-xs-09-16-3-4-1-5.smt.expect \
-       regress0/decision/wchains010ue.delta02.smt.expect \
-       regress0/decision/wchains010ue.smt.expect \
-       regress0/expect/scrub.01.smt.expect \
-       regress0/expect/scrub.03.smt2.expect \
-       regress0/quantifiers/bug291.smt2.expect \
-       regress0/uflia/check02.smt2.expect \
-       regress0/uflia/check03.smt2.expect \
-       regress0/uflia/check04.smt2.expect \
-       regress0/uflia/check04.smt2.expect \
-       regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2.expect \
-       regress0/uflia/tiny.smt2.expect \
-       regress1/bug216.smt2.expect \
-       regress1/bug590.smt2.expect \
-       regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect \
-       regress1/decision/quant-symmetric_unsat_7.smt2.expect \
-       regress1/push-pop/bug216.smt2.expect \
-       regress1/simplification_bug4.smt2.expect \
-       regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect \
-       regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect \
-       regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect \
-       regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect \
-       regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2.expect \
-       regress2/uflia-error0.smt2.expect \
-       regress2/xs-09-16-3-4-1-5.decn.smt.expect \
-       regress3/pp-regfile.smt.expect
index e1ac799767ff5f4bec646049abe256cf272e6bbd..d43ebf3379ebd3f4911dd68386e3c921191a53d9 100644 (file)
@@ -121,9 +121,3 @@ This benchmark is only run when symfpu has been configured.  Multiple
 as a requirement, refer to CVC4's `--show-config` output. Features can also be
 excluded by adding the `no-` prefix, e.g. `no-symfpu` means that the test is
 not valid for builds that include symfpu support.
-
-Sometimes it is useful to keep the directives separate. You can separate the
-benchmark from the output expectations by putting the benchmark in `<benchmark
-file>.smt` and the directives in `<benchmark file>.smt.expect`, which is looked
-for by the regression script. Note that `*.expect` files should be added to the
-`EXTRA_DIST` variable in [Makefile.am](Makefile.am).
index f942cbc755192cf74b6f6cf19a3fff95e8508542..4bb2846fe806dc77fa5cebeb44774a717fc8b58b 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --miplib-trick
+; EXPECT: unsat
+
 (benchmark mip_opt1217
 :source {
 Relaxation of the Mixed-Integer Programming
diff --git a/test/regress/regress0/arith/miplib-opt1217--27.smt.expect b/test/regress/regress0/arith/miplib-opt1217--27.smt.expect
deleted file mode 100644 (file)
index 24c63a4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --miplib-trick
-% EXPECT: unsat
index 21c588ad340cc4a7ee7488f52854a25073605d8c..9ad3a0753c604aafdd9efa6966ac3fe1f09740ad 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --miplib-trick
+; EXPECT: unsat
+
 (benchmark mip_pp08a
 :source {
 Relaxation of the Mixed-Integer Programming
diff --git a/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect b/test/regress/regress0/arith/miplib-pp08a-3000.smt.expect
deleted file mode 100644 (file)
index 24c63a4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --miplib-trick
-% EXPECT: unsat
index 6605e2f09b12ed81feed40da559d9519f7e935cd..0846c4c38db20abc6df734d31e7dc8625264e2f5 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: sat
+
 (benchmark fuzzsmt
 :logic QF_AUFBV
 :status sat
diff --git a/test/regress/regress0/decision/aufbv-fuzz01.smt.expect b/test/regress/regress0/decision/aufbv-fuzz01.smt.expect
deleted file mode 100644 (file)
index 849b886..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: sat
index 55aec063dbcce3ff09e290f00afc0afbadeec93a..c9078b7b989e5f6a490839257f57b4ba326789c2 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark bitvec0.smt
 :logic QF_BV
 :extrafuns ((t BitVec[32]))
diff --git a/test/regress/regress0/decision/bitvec0.delta01.smt.expect b/test/regress/regress0/decision/bitvec0.delta01.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 12766375f594acb5860aecd47bb22fefe8c496e3..860ca78ee0499d85937f2bd4176bf370f83db4cb 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark bitvec0.smt
   :source {
 Hand-crafted bit-vector benchmarks.  Some are from the SVC benchmark suite.
diff --git a/test/regress/regress0/decision/bitvec0.smt.expect b/test/regress/regress0/decision/bitvec0.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 3b6f2f3b93e11cc9918b940d8a8518783cc93b3b..6bf931bb5cc594c2b49a5403df3b6d072a2fb963 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark bitvec5.smt
   :source {
 Hand-crafted bit-vector benchmarks.  Some are from the SVC benchmark suite.
diff --git a/test/regress/regress0/decision/bitvec5.smt.expect b/test/regress/regress0/decision/bitvec5.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index f467cd4b3d12a255354f58725ced07588a8c6a95..db0e5fbffe87293984b4c76c959b093841be5f2f 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: sat
+
 (benchmark B_
   :status sat
   :category { unknown }
diff --git a/test/regress/regress0/decision/bug347.smt.expect b/test/regress/regress0/decision/bug347.smt.expect
deleted file mode 100644 (file)
index 849b886..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: sat
index e338417c5504b1a3598945937f1ec2df608451c5..7dffa939caa65b1dd546978d851d8fe456f1c805 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark fuzzsmt
 :logic AUFLIA
 :status unknown
diff --git a/test/regress/regress0/decision/bug374a.smt.expect b/test/regress/regress0/decision/bug374a.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index a253cf12f301a33984d0332a69bc2fb5dea0eccc..f9d3f440d43fcc70cec23ea6b2ad22cf45456055 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification --no-unconstrained
+; EXPECT: unsat
+
 (set-logic QF_ALL_SUPPORTED)
 (declare-fun _substvar_245_ () Bool)
 (declare-fun _substvar_246_ () Bool)
diff --git a/test/regress/regress0/decision/bug374b.smt2.expect b/test/regress/regress0/decision/bug374b.smt2.expect
deleted file mode 100644 (file)
index 0be4713..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification --no-unconstrained
-% EXPECT: unsat
diff --git a/test/regress/regress0/decision/just_sat.expect b/test/regress/regress0/decision/just_sat.expect
deleted file mode 100644 (file)
index 849b886..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: sat
diff --git a/test/regress/regress0/decision/just_unsat.expect b/test/regress/regress0/decision/just_unsat.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 7eb3277be6ed2516fddfa53e3f750e40038db384..2f475e8deb12a9a9738d80d04123e52a45dd5b95 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark pp_regfile.smt
 :logic QF_AUFLIA
 :extrafuns ((REGFILE_INIT Array))
diff --git a/test/regress/regress0/decision/pp-regfile.delta01.smt.expect b/test/regress/regress0/decision/pp-regfile.delta01.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 1c461eb6fcdb0fc8e7deb0bf2acb3f08e11fb58a..f00f26a451e8cfb950d7abbba8efb74e6ea587d6 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark pp_regfile.smt
 :logic QF_AUFLIA
 :extrafuns ((REGFILE_INIT Array))
diff --git a/test/regress/regress0/decision/pp-regfile.delta02.smt.expect b/test/regress/regress0/decision/pp-regfile.delta02.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index a8f4ff2b99a11e4361a646a654f7ad4ec0abb3f6..21fa06270fab56d5d80b62028e2f5d47a89d9fc6 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: sat
+
 (set-logic AUFLIRA)
 (set-info :smt-lib-version 2.0)
 (set-info :category "industrial")
diff --git a/test/regress/regress0/decision/quant-ex1.smt2.expect b/test/regress/regress0/decision/quant-ex1.smt2.expect
deleted file mode 100644 (file)
index 849b886..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: sat
index 6f65e83ecbde3ea63218d73b279bfad794eba27f..9dfba13d50d6057457e880e00c9e55ff22afc24f 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: sat
+
 (benchmark mathsat
 :logic QF_UFLIA
 :extrafuns ((fmt_length Int))
diff --git a/test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt.expect b/test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.delta03.smt.expect
deleted file mode 100644 (file)
index 849b886..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: sat
index 549306c5bd009067eca8537fe2fb95220dec5018..a6e54626e6f0ef554eec65f670534703d17d2b84 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark mathsat
 :source { MathSat group }
 :logic QF_UFLIA
diff --git a/test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.smt.expect b/test/regress/regress0/decision/uflia-xs-09-16-3-4-1-5.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index d5ddf6446ddb940a7a6a5a6dfef63390f248c017..0ca1d9e44fa4bd6dcc795f7fe2f624d349b5b85c 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark wchains010ue.smt
 :logic QF_AUFBV
 :extrafuns ((v6 BitVec[32]))
diff --git a/test/regress/regress0/decision/wchains010ue.delta02.smt.expect b/test/regress/regress0/decision/wchains010ue.delta02.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index a4d0f1ddb2f6e60892ad133a9ce2536456092c42..ad47c62603218a15430fe2ea8db69afe995d407b 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark wchains010ue.smt
 :source {
 This benchmark generates write chain permutations and tries to show
diff --git a/test/regress/regress0/decision/wchains010ue.smt.expect b/test/regress/regress0/decision/wchains010ue.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 592a3501f7cc3c966a6137ad20914cdbd4ea74ce..ee7d56f29c155420a00092515ec4207211ca5e4d 100644 (file)
@@ -1,3 +1,9 @@
+; SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/'
+; EXPECT: (error "A non-linear fact was asserted to arithmetic in a linear logic.
+; EXPECT: The fact in question: TERM
+; EXPECT: ")
+; EXIT: 1
+
 (benchmark reject_nonlinear
 :logic QF_LRA
 :extrafuns ((n Real))
diff --git a/test/regress/regress0/expect/scrub.01.smt.expect b/test/regress/regress0/expect/scrub.01.smt.expect
deleted file mode 100644 (file)
index 4c5aa14..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-% SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/'
-% EXPECT: (error "A non-linear fact was asserted to arithmetic in a linear logic.
-% EXPECT: The fact in question: TERM
-% EXPECT: ")
-% EXIT: 1
index a5a2c9be129271a3ca46c51af7d83f8a857fdab4..9f773e13dcaa87acfa66dffdfbdbf2062eec0504 100644 (file)
@@ -1,3 +1,9 @@
+; SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/'
+; EXPECT: (error "A non-linear fact was asserted to arithmetic in a linear logic.
+; EXPECT: The fact in question: TERM
+; EXPECT: ")
+; EXIT: 1
+
 (set-logic QF_LRA)
 (set-info :status unknown)
 (declare-fun n () Real)
diff --git a/test/regress/regress0/expect/scrub.03.smt2.expect b/test/regress/regress0/expect/scrub.03.smt2.expect
deleted file mode 100644 (file)
index 4c5aa14..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-% SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/'
-% EXPECT: (error "A non-linear fact was asserted to arithmetic in a linear logic.
-% EXPECT: The fact in question: TERM
-% EXPECT: ")
-% EXIT: 1
index b39e415a827beb117cf901f7a3a45cd256804eee..959d83c7fbd60443ef78b93e9a7c74f153218d46 100644 (file)
@@ -1,3 +1,5 @@
+; EXPECT: unknown
+; EXPECT: (:reason-unknown incomplete)
 (set-logic AUFLIA)
 (set-info :source | 
   Boogie/Spec# benchmarks.
diff --git a/test/regress/regress0/quantifiers/bug291.smt2.expect b/test/regress/regress0/quantifiers/bug291.smt2.expect
deleted file mode 100644 (file)
index f97ed61..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% EXPECT: unknown
-% EXPECT: (:reason-unknown incomplete)
\ No newline at end of file
index 0920170c6da58403e36717603b10b9b2df993718..daa3ca417809f5bf9caf4f9c0d755f8e1539d263 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 (declare-fun b () Int)
 (declare-fun n () Int)
diff --git a/test/regress/regress0/uflia/check02.smt2.expect b/test/regress/regress0/uflia/check02.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index f561e1964c0d8966a3a717b0f0958b02ffbb232f..e4503ba1d39e65f041c04697f10971e767a42a70 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 
 (declare-fun _n () Int)
diff --git a/test/regress/regress0/uflia/check03.smt2.expect b/test/regress/regress0/uflia/check03.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index 61bc8a5d6ac8176ae9418bc9070314dc718d0e07..a6630dfa34b56940aedfb29f8de80215a61a2219 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_LIA)
 (declare-fun _b () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress0/uflia/check04.smt2.expect b/test/regress/regress0/uflia/check04.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index 019d70de9a3ac44c457822131b97e14a11d256cf..779b6237b86699e979e2f8dde57f0c169f8cd324 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 (declare-fun _base () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2.expect b/test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.minimized.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index fc0251a557e037a460089325e7d29d56e2492ff7..bad1964c2965b567e598c3c76228c49912820294 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental --simplification=none
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 (declare-fun base () Int)
 (declare-fun n () Int)
diff --git a/test/regress/regress0/uflia/tiny.smt2.expect b/test/regress/regress0/uflia/tiny.smt2.expect
deleted file mode 100644 (file)
index 7081f83..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental --simplification=none
-% EXPECT: sat
-% EXPECT: unsat
index 78e0f716ce4bf4db0f2d7201f0403a81fa18b59a..53f4fac9c1374f7bc4d3ab582b7bd7b7f71b9b07 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UF)
 (declare-fun x () Bool)
 (declare-fun y () Bool)
diff --git a/test/regress/regress1/bug216.smt2.expect b/test/regress/regress1/bug216.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index 68665f629566833cce4857b67512c86ec900220d..448c65f99231202c4f2b65c0cedc2926712f2649 100644 (file)
@@ -1,3 +1,6 @@
+; EXPECT: unknown
+; EXPECT: ((charlst2 ((as const (Array Int String)) "")))
+
 (set-logic QF_ALL_SUPPORTED)
 (set-option :strings-exp true)
 (set-option :produce-models true)
diff --git a/test/regress/regress1/bug590.smt2.expect b/test/regress/regress1/bug590.smt2.expect
deleted file mode 100644 (file)
index b24a807..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% EXPECT: unknown
-% EXPECT: ((charlst2 ((as const (Array Int String)) "")))
index 3398f5f84b43b7117b8d00e345ac3ff15c2a9126..cfb036f168e60243362d2340c45bc462bd8727e0 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (set-logic AUFLIA)
 (set-info :source | 
   Boogie/Spec# benchmarks.
diff --git a/test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect b/test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 6acf4a3c621e08acfe68d91b9aa0cb8a6e90820b..37accd35b9f686ab012f30ccda1ce620b7929747 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --no-check-proofs --no-check-unsat-cores --decision=justification
+; EXPECT: unsat
+
 (set-logic AUFLIRA)
 (set-info :source | Example extracted from Peter Baumgartner's talk at CADE-21: Logical Engineering with Instance-Based Methods.
 
diff --git a/test/regress/regress1/decision/quant-symmetric_unsat_7.smt2.expect b/test/regress/regress1/decision/quant-symmetric_unsat_7.smt2.expect
deleted file mode 100644 (file)
index 9d6ac53..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --no-check-proofs --no-check-unsat-cores --decision=justification
-% EXPECT: unsat
index 78e0f716ce4bf4db0f2d7201f0403a81fa18b59a..53f4fac9c1374f7bc4d3ab582b7bd7b7f71b9b07 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+
 (set-logic QF_UF)
 (declare-fun x () Bool)
 (declare-fun y () Bool)
diff --git a/test/regress/regress1/push-pop/bug216.smt2.expect b/test/regress/regress1/push-pop/bug216.smt2.expect
deleted file mode 100644 (file)
index fe11817..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: unsat
index 0d62d69219b20c768644f911c8379224fed282e5..5f74efa7a7524bc9198ec79fce20993e91a4040d 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+
 (set-logic QF_LIA)
 ;; Simplified benchmark, derived from NuSMV output durationThm_1.bmc_k100.smt2
 ;;
diff --git a/test/regress/regress1/simplification_bug4.smt2.expect b/test/regress/regress1/simplification_bug4.smt2.expect
deleted file mode 100644 (file)
index 1ed776c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: unsat
index ab8e5d1dac08e5409275b732b8fad2bbb346db30..fd945c64f0294d2474a8ba15387c7c5dbbf8a7da 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: sat
+
 (set-logic QF_UFLIA)
 (declare-fun _base () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect b/test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect
deleted file mode 100644 (file)
index 9403b1a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
-% EXPECT: sat
index 0274e4390b3b6d6cc9b9609d224e1e465f44f038..84ed4b1999af04a2f955033dd3ba69fc7955ffc0 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+
 (set-logic QF_UFLIA)
 (set-info :smt-lib-version 2.0)
 (declare-fun _base () Int)
diff --git a/test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect b/test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect
deleted file mode 100644 (file)
index 85c1808..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: sat
index 11fdfa51d525a82f1ef6f2c6cd7776a5506f78a8..4dfa9c727b05fc7574a4121b308e242f5da9997f 100644 (file)
@@ -1,3 +1,9 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 (declare-fun _base () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect b/test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect
deleted file mode 100644 (file)
index 65fb9b3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: unsat
-% EXPECT: sat
-% EXPECT: unsat
-% EXPECT: unsat
index 381eb740b7d0cd58c3999652a92370f9a5601cdd..1faef010996320d4fd450876f16909322a751b18 100644 (file)
@@ -1,3 +1,11 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: unsat
+
 (set-logic QF_UFLIA)
 (declare-fun _base () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect b/test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect
deleted file mode 100644 (file)
index 70b8fa2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: unsat
-% EXPECT: sat
-% EXPECT: unsat
-% EXPECT: sat
-% EXPECT: unsat
-% EXPECT: unsat
index 25f006d30d5e3cce99f087d78ea70437e7557267..ebea5b80a040e3b8cb6305b923cc0f46f967fc0b 100644 (file)
@@ -1,3 +1,7 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: sat
+
 (set-logic QF_UFLIA)
 (declare-fun _base () Int)
 (declare-fun _n () Int)
diff --git a/test/regress/regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2.expect b/test/regress/regress2/FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2.expect
deleted file mode 100644 (file)
index 7cb6ba8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: unsat
-% EXPECT: sat
index 73177a25202bbdcb20b15d8d3160d939ef449742..b43c326c0afbb300a81bef0b8334197a61b5accc 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 
 (set-logic QF_UFLIA)
 (declare-sort U 0)
diff --git a/test/regress/regress2/uflia-error0.smt2.expect b/test/regress/regress2/uflia-error0.smt2.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 549306c5bd009067eca8537fe2fb95220dec5018..a6e54626e6f0ef554eec65f670534703d17d2b84 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark mathsat
 :source { MathSat group }
 :logic QF_UFLIA
diff --git a/test/regress/regress2/xs-09-16-3-4-1-5.decn.smt.expect b/test/regress/regress2/xs-09-16-3-4-1-5.decn.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 0b9d07b8418207ee02590f4c7adc2652aa85c657..f3eedd758384dc004f5abe411e4c0a93e3d02d84 100644 (file)
@@ -1,3 +1,6 @@
+; COMMAND-LINE: --decision=justification
+; EXPECT: unsat
+
 (benchmark pp_regfile.smt
   :source {
 Translated from old SVC processor verification benchmarks.  Contact Clark
diff --git a/test/regress/regress3/pp-regfile.smt.expect b/test/regress/regress3/pp-regfile.smt.expect
deleted file mode 100644 (file)
index 7fd1d5a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-% COMMAND-LINE: --decision=justification
-% EXPECT: unsat
index 1114b4a2c01bde3ab6dc9c13efb84c16735316af..6f6edf0587716241f2891d580389f88fc5a09b51 100755 (executable)
@@ -169,24 +169,10 @@ def run_regression(unsat_cores, proofs, dump, wrapper, cvc4_binary,
         sys.exit('"{}" must be *.cvc or *.smt or *.smt2 or *.p or *.sy'.format(
             benchmark_basename))
 
-    # If there is an ".expect" file for the benchmark, read the metadata
-    # from there, otherwise from the benchmark file.
-    metadata_filename = benchmark_path + '.expect'
-    if os.path.isfile(metadata_filename):
-        comment_char = '%'
-    else:
-        metadata_filename = benchmark_path
-
-    metadata_lines = None
-    with open(metadata_filename, 'r') as metadata_file:
-        metadata_lines = metadata_file.readlines()
-
-    benchmark_content = None
-    if metadata_filename == benchmark_path:
-        benchmark_content = ''.join(metadata_lines)
-    else:
-        with open(benchmark_path, 'r') as benchmark_file:
-            benchmark_content = benchmark_file.read()
+    benchmark_lines = None
+    with open(benchmark_path, 'r') as benchmark_file:
+        benchmark_lines = benchmark_file.readlines()
+    benchmark_content = ''.join(benchmark_lines)
 
     # Extract the metadata for the benchmark.
     scrubber = None
@@ -196,7 +182,7 @@ def run_regression(unsat_cores, proofs, dump, wrapper, cvc4_binary,
     expected_exit_status = None
     command_lines = []
     requires = []
-    for line in metadata_lines:
+    for line in benchmark_lines:
         # Skip lines that do not start with a comment character.
         if line[0] != comment_char:
             continue