Make regress1 default, only test regress0 on Travis. (#1611)

diff --git a/.travis.yml b/.travis.yml
index 562987f3c57a715d176be4f514234ac96c66c4c8..e8c858d18aa2ac96b72baafd5decb2286488b4c2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,7 +81,9 @@ script:
        error "DISTCHECK (WITH NEWTHEORY TESTS) FAILED";
    }
    makeCheck() {
-     make V=1 -j2 check CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/TEST FAILED";
+     make V=1 -j2 units || error "BUILD/UNIT TEST FAILED";
+     make V=1 -j2 systemtests || error "BUILD/SYSTEM TEST FAILED";
+     make V=1 -j2 regress0 CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/REGRESSION TEST FAILED";
    }
    makeExamples() {
      make V=1 -j2 examples || error "COULD NOT BUILD EXAMPLES${normal}";

diff --git a/test/regress/Makefile.am b/test/regress/Makefile.am
index b9864d51b9f4632552b267ac9c5108b85c588354..0c2c8a5650a6bac9b837a067ded4e4fe884588e1 100644 (file)
--- a/test/regress/Makefile.am
+++ b/test/regress/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = regress0
+SUBDIRS = regress0 regress1
 DIST_SUBDIRS = regress0 regress1 regress2 regress3 regress4
 
 @mk_include@ @srcdir@/Makefile.levels