diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.builds.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/regress/regress0/Makefile.am | 1 | ||||
| -rw-r--r-- | test/regress/regress0/aufbv/Makefile.am | 2 | ||||
| -rw-r--r-- | test/regress/regress0/unconstrained/Makefile | 8 | ||||
| -rw-r--r-- | test/regress/regress0/unconstrained/Makefile.am | 2 |
8 files changed, 18 insertions, 5 deletions
@@ -13,7 +13,7 @@ all .DEFAULT: echo cd $(builddir); \ cd $(builddir); \ echo $(MAKE) $@; \ - $(MAKE) $@; \ + $(MAKE) $@ || exit 1; \ else \ echo; \ echo 'Run configure first, or type "make" in a configured build directory.'; \ @@ -25,7 +25,7 @@ distclean maintainerclean: echo cd $(builddir); \ cd $(builddir); \ echo $(MAKE) $@; \ - $(MAKE) $@; \ + $(MAKE) $@ || exit 1; \ fi test -z "$(builddir)" || rm -fr "$(builddir)" rm -f config.reconfig diff --git a/Makefile.builds.in b/Makefile.builds.in index 054b4eb7b..96dc8d3cf 100644 --- a/Makefile.builds.in +++ b/Makefile.builds.in @@ -200,7 +200,7 @@ regress%: all +(cd $(CURRENT_BUILD)/test && $(MAKE) $@) dist: - +(cd $(CURRENT_BUILD) && $(MAKE) $@) + (cd $(CURRENT_BUILD) && $(MAKE) $@) $(install_sh) \ $(CURRENT_BUILD)/$(distdir).tar.gz \ "`pwd`" diff --git a/configure.ac b/configure.ac index 15fb16d3f..6943ffc82 100644 --- a/configure.ac +++ b/configure.ac @@ -203,7 +203,7 @@ if test -n "${enable_replay+set}"; then fi AC_MSG_RESULT([$with_build]) -AM_INIT_AUTOMAKE([1.11 no-define parallel-tests color-tests]) +AM_INIT_AUTOMAKE([1.11 no-define tar-pax parallel-tests color-tests]) AC_CONFIG_HEADERS([cvc4autoconfig.h]) # Initialize libtool's configuration options. diff --git a/test/Makefile.am b/test/Makefile.am index a870ac44a..bbb009a0c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -45,7 +45,7 @@ subdirs_to_check = \ regress/regress0/push-pop \ regress/regress0/precedence \ regress/regress0/preprocess \ - regress/regress0/subtypes \ + regress/regress0/unconstrained \ regress/regress1 \ regress/regress2 \ regress/regress3 diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am index db9b4d07f..bb9cb2384 100644 --- a/test/regress/regress0/Makefile.am +++ b/test/regress/regress0/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = . arith precedence uf uflra uflia bv arrays aufbv auflia datatypes lemmas push-pop preprocess +DIST_SUBDIRS = $(SUBDIRS) unconstrained BINARY = cvc4 if PROOF_REGRESSIONS diff --git a/test/regress/regress0/aufbv/Makefile.am b/test/regress/regress0/aufbv/Makefile.am index 9b9820258..cd5f1d981 100644 --- a/test/regress/regress0/aufbv/Makefile.am +++ b/test/regress/regress0/aufbv/Makefile.am @@ -5,6 +5,8 @@ else TESTS_ENVIRONMENT = @srcdir@/../../run_regression $(RUN_REGRESSION_ARGS) @top_builddir@/src/main/$(BINARY) 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 b/test/regress/regress0/unconstrained/Makefile new file mode 100644 index 000000000..594b10e3c --- /dev/null +++ b/test/regress/regress0/unconstrained/Makefile @@ -0,0 +1,8 @@ +topdir = ../../../.. +srcdir = test/regress/regress0/unconstrained + +include $(topdir)/Makefile.subdir + +# synonyms for "check" +.PHONY: test +test: check diff --git a/test/regress/regress0/unconstrained/Makefile.am b/test/regress/regress0/unconstrained/Makefile.am index 241b78848..e963ae739 100644 --- a/test/regress/regress0/unconstrained/Makefile.am +++ b/test/regress/regress0/unconstrained/Makefile.am @@ -59,6 +59,8 @@ TESTS = \ uf2.smt2 \ xor.smt2 +EXTRA_DIST = $(TESTS) + #if CVC4_BUILD_PROFILE_COMPETITION #else #TESTS += \ |