4 files changed, 38 insertions, 2 deletions
diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am
index 66112defc..4744cc0fe 100644
--- 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 9a9016e85..f133a272d 100644
--- 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 710ee6b8e..9dd4934ac 100644
--- 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 156fffb54..5d34df14d 100644
--- 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