Some standardization of regression Makefiles that got out of sync. Fixes cases of...

diff --git a/test/regress/regress0/arrays/Makefile.am b/test/regress/regress0/arrays/Makefile.am
index 62877ddf3e677e93385dcb358a5bba5474abd114..345856d856abc95ba0907599c3e5b35b2178eee2 100644 (file)
--- a/test/regress/regress0/arrays/Makefile.am
+++ b/test/regress/regress0/arrays/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/auflia/Makefile.am b/test/regress/regress0/auflia/Makefile.am
index 31d9c079708dfd481c35fb4a1dfbfbb4ce206334..d182539bcc38a597583ce1d9d24d4c2b50002be1 100644 (file)
--- a/test/regress/regress0/auflia/Makefile.am
+++ b/test/regress/regress0/auflia/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/bv/core/Makefile.am b/test/regress/regress0/bv/core/Makefile.am
index 7c411121aaa737662365d85a1255d0a155dfd41d..0e3133b327c7722df9b9e64e9434403461cc60d8 100644 (file)
--- a/test/regress/regress0/bv/core/Makefile.am
+++ b/test/regress/regress0/bv/core/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/precedence/Makefile.am b/test/regress/regress0/precedence/Makefile.am
index 1d980997dd4fdfbcc7cb81ea0a405744d0fb1a29..1afcc0293115b230673716b9980ee0974a6f26e9 100644 (file)
--- a/test/regress/regress0/precedence/Makefile.am
+++ b/test/regress/regress0/precedence/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/rewriterules/Makefile.am b/test/regress/regress0/rewriterules/Makefile.am
index 5aba7dcecb11603c1dcb437474f48c33974d053f..3a3a097bda94f14871424f3a20b947ac0651fd12 100644 (file)
--- a/test/regress/regress0/rewriterules/Makefile.am
+++ b/test/regress/regress0/rewriterules/Makefile.am
@@ -1,6 +1,3 @@
-CVC4_REGRESSION_ARGS ?= --rewrite-rules
-export CVC4_REGRESSION_ARGS
-
 # don't override a BINARY imported from a personal.mk
 @mk_if@eq ($(BINARY),)
 @mk_empty@BINARY = cvc4
@@ -16,16 +13,24 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+override CVC4_REGRESSION_ARGS += --rewrite-rules
+export CVC4_REGRESSION_ARGS
+
 MAKEFLAGS = -k
 
 # 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 =        \
-       length_trick.smt2 length_trick2.smt2 length_gen_020.smt2 \
-       datatypes.smt2 datatypes_sat.smt2 reachability_back_to_the_future.smt2 \
-        relation.smt2 simulate_rewriting.smt2 \
-        native_arrays.smt2
+       length_trick.smt2 \
+       length_trick2.smt2 \
+       length_gen_020.smt2 \
+       datatypes.smt2 \
+       datatypes_sat.smt2 \
+       reachability_back_to_the_future.smt2 \
+       relation.smt2 \
+       simulate_rewriting.smt2 \
+       native_arrays.smt2
 
 # reachability_bbttf_eT_arrays.smt2 set_A_new_fast_tableau-base.smt2 set_A_new_fast_tableau-base_sat.smt2
 

diff --git a/test/regress/regress0/sets/Makefile.am b/test/regress/regress0/sets/Makefile.am
index f040a6cd0e19faffbeb306b735bd21212b79ff35..32a96ec21be84449c5d2ebe9fe1f7dd6660ff22a 100644 (file)
--- a/test/regress/regress0/sets/Makefile.am
+++ b/test/regress/regress0/sets/Makefile.am
@@ -9,10 +9,12 @@ AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY)$(EXEEXT)
 if AUTOMAKE_1_11
 # old-style (pre-automake 1.12) test harness
 TESTS_ENVIRONMENT = \
-       $(TESTS_ENVIRONMENT) $(LOG_COMPILER) \
+       $(LOG_COMPILER) \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/tptp/Makefile.am b/test/regress/regress0/tptp/Makefile.am
index f8f106362eca58b9cacb92a3d655f5453c0b0afd..e0c8a2b48c2fc7f6e522b69423afc50a8eb25cd2 100644 (file)
--- a/test/regress/regress0/tptp/Makefile.am
+++ b/test/regress/regress0/tptp/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # escape the `=' in file names
 equals = =
 

diff --git a/test/regress/regress0/uf/Makefile.am b/test/regress/regress0/uf/Makefile.am
index 98194413d078def9047e7e53b391d169f490ccc2..da992286ea2723051864912d05252fa867b5f986 100644 (file)
--- a/test/regress/regress0/uf/Makefile.am
+++ b/test/regress/regress0/uf/Makefile.am
@@ -13,6 +13,8 @@ TESTS_ENVIRONMENT = \
        $(AM_LOG_FLAGS) $(LOG_FLAGS)
 endif
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="

diff --git a/test/regress/regress0/unconstrained/Makefile.am b/test/regress/regress0/unconstrained/Makefile.am
index ecf427fb531c002c084ca8c79ff833f981987123..fcae3196abd97abd689830a34fd45f72b1fe55aa 100644 (file)
--- a/test/regress/regress0/unconstrained/Makefile.am
+++ b/test/regress/regress0/unconstrained/Makefile.am
@@ -16,6 +16,8 @@ endif
 override CVC4_REGRESSION_ARGS += --unconstrained-simp
 export CVC4_REGRESSION_ARGS
 
+MAKEFLAGS = -k
+
 # These are run for all build profiles.
 # If a test shouldn't be run in e.g. competition mode,
 # put it below in "TESTS +="