fix some minor annoyances in the regression test Makefiles; add some documentation

diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am
index 66112defcd5557e9001b2325702ba79e606edfad..4744cc0fe0a1411932c1204379a0b2fcac339894 100644 (file)
--- a/test/regress/regress0/Makefile.am
+++ b/test/regress/regress0/Makefile.am
@@ -1,10 +1,10 @@
-SUBDIRS = precedence uf
+SUBDIRS = . precedence uf
 
 TESTS_ENVIRONMENT = @srcdir@/../run_regression @top_builddir@/src/main/cvc4
 
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
-# put it below.
+# put it below in "TESTS +="
 TESTS =        \
        boolean-prec.cvc \
        distinct.smt \

diff --git a/test/regress/regress1/Makefile.am b/test/regress/regress1/Makefile.am
index 9a9016e8566796c9725b79235f367e82545dd00d..f133a272d652aadfa1df8eb278ec66488a76a580 100644 (file)
--- a/test/regress/regress1/Makefile.am
+++ b/test/regress/regress1/Makefile.am
@@ -1,4 +1,10 @@
+SUBDIRS = .
+
 TESTS_ENVIRONMENT = @srcdir@/../run_regression @top_builddir@/src/main/cvc4
+
+# These are run for all build profiles.
+# If a test shouldn't be run in e.g. competition mode,
+# put it below in "TESTS +="
 TESTS =        friedman_n4_i5.smt \
        hole7.cvc \
        hole8.cvc \
@@ -6,6 +12,12 @@ TESTS =       friedman_n4_i5.smt \
        fuzz_1.smt \
        fuzz_2.smt
 
+#if CVC4_BUILD_PROFILE_COMPETITION
+#else
+#TESTS += \
+#      error.cvc
+#endif
+
 # synonyms for "check"
 .PHONY: regress regress1 test
 regress regress1 test: check

diff --git a/test/regress/regress2/Makefile.am b/test/regress/regress2/Makefile.am
index 710ee6b8e960d7056be63dfd1892c07531447c50..9dd4934ac156ebf0533938aaaf8cf8e6cd2c81c2 100644 (file)
--- a/test/regress/regress2/Makefile.am
+++ b/test/regress/regress2/Makefile.am
@@ -1,4 +1,10 @@
+SUBDIRS = .
+
 TESTS_ENVIRONMENT = @srcdir@/../run_regression @top_builddir@/src/main/cvc4
+
+# These are run for all build profiles.
+# If a test shouldn't be run in e.g. competition mode,
+# put it below in "TESTS +="
 TESTS =        bmc-galileo-8.smt \
        bmc-galileo-9.smt \
        bmc-ibm-10.smt \
@@ -16,6 +22,12 @@ TESTS =      bmc-galileo-8.smt \
        hole9.cvc \
        qwh.35.405.shuffled-as.sat03-1651.smt
 
+#if CVC4_BUILD_PROFILE_COMPETITION
+#else
+#TESTS += \
+#      error.cvc
+#endif
+
 # synonyms for "check"
 .PHONY: regress regress2 test
 regress regress2 test: check

diff --git a/test/regress/regress3/Makefile.am b/test/regress/regress3/Makefile.am
index 156fffb54f7e34617dc12255fb6008a94b8783ba..5d34df14d0aae557d147b3d914166ac64e111103 100644 (file)
--- a/test/regress/regress3/Makefile.am
+++ b/test/regress/regress3/Makefile.am
@@ -1,9 +1,21 @@
+SUBDIRS = .
+
 TESTS_ENVIRONMENT = @srcdir@/../run_regression @top_builddir@/src/main/cvc4
+
+# These are run for all build profiles.
+# If a test shouldn't be run in e.g. competition mode,
+# put it below in "TESTS +="
 TESTS =        C880mul.miter.shuffled-as.sat03-348.smt \
        comb2.shuffled-as.sat03-420.smt \
        hole10.cvc \
        instance_1151.smt
 
+#if CVC4_BUILD_PROFILE_COMPETITION
+#else
+#TESTS += \
+#      error.cvc
+#endif
+
 # synonyms for "check"
 .PHONY: regress regress3 test
 regress regress3 test: check