Test portfolio with --no-wait-to-join.
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Jun 2014 13:56:39 +0000 (09:56 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Jun 2014 13:56:39 +0000 (09:56 -0400)
.travis.yml
Makefile

index 18204d3c6923eca209d24eeef863b7ab464c1be8..082a746c57bede5c33436839a95edfc44cc7995d 100644 (file)
@@ -43,7 +43,7 @@ script:
      make -j2 check CVC4_REGRESSION_ARGS='--no-early-exit' || error "BUILD/TEST FAILED";
    }
    makeCheckPortfolio() {
-     make check BINARY=pcvc4 CVC4_REGRESSION_ARGS='--fallback-sequential --no-early-exit' RUN_REGRESSION_ARGS= ||
+     make check BINARY=pcvc4 CVC4_REGRESSION_ARGS='--fallback-sequential --no-wait-to-join --no-early-exit' RUN_REGRESSION_ARGS= ||
        error "PORTFOLIO TEST FAILED";
    }
    makeExamples() {
index f0541bfae2b06d6a6d6d4e678c5289552a9fb20d..50d85d37ab114a9e6d194efeb519e5d2d376f9b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ submission-parallel:
          ../../configure competition --disable-shared --enable-static-binary --with-gmp --with-portfolio --with-glpk --with-abc --without-readline --enable-gpl; \
          $(MAKE) V=1; \
          strip src/main/pcvc4; \
-         $(MAKE) check BINARY=pcvc4 CVC4_REGRESSION_ARGS=--fallback-sequential || true )
+         $(MAKE) check BINARY=pcvc4 CVC4_REGRESSION_ARGS='--fallback-sequential --no-wait-to-join' || true )
        # package the parallel track zipfile
        mkdir -p cvc4-smtcomp-parallel-$(YEAR)/bin
        cp -p builds-smtcomp/parallel/src/main/pcvc4 cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4