Fixing numerous issues with tests and "make dist":

* test/regress/regress0/unconstrained wasn't being distributed.  This caused the debian build failure last night.  (It still doesn't run on "make check", but had to be distributed properly.)
* Fixing an issue where a test name was longer than 99 characters and couldn't be distributed in the "old" tar format.  (Told automake to use a newer tar format.)

diff --git a/Makefile b/Makefile
index 5f1b42f0e9c50cfa52a4e99f7f342c76d9daa500..fad2350c46cb9849e0227587d95c068883defaaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 054b4eb7b99df510f6022db021b08f8b41fbe4e4..96dc8d3cf50603fcea36cd36227ae0052c653aa1 100644 (file)
--- 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 15fb16d3f55b52eb7dfa2d69973779cd4e064df1..6943ffc82604efae5c44699a5378273fc2c9803e 100644 (file)
--- 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 a870ac44a90f28dddfbb7165ef673940d96d869d..bbb009a0cde56e0b952278acd3b7a128fba20f14 100644 (file)
--- 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 db9b4d07f2bac7cc183aff7db07dbe16893117b1..bb9cb23841116c4fd0dac1b0b736a50ff361f15a 100644 (file)
--- 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 9b9820258b7947155e4859c8a50c734fa261e480..cd5f1d981dace41142e6cfa088635830acedc9e0 100644 (file)
--- 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 (file)
index 0000000..594b10e
--- /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 241b788484a2d4dcf8c850f0c11c14f1fd090a23..e963ae739941c9d178499443115d6c5521793c0a 100644 (file)
--- 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 += \