Set make's default shell to bash. Previously on my machine it was bourne, which cause...

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@349 e59a4935-1847-0410-ae03-e826735625c1

diff --git a/Makefile b/Makefile
index 42320f87796f07eb3cbd12d127400b9f797970e3..4e0bb863fa8f513490c3355039b8e6dc696a180c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ regresscvc:
        @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG)
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
-       scripts/run_cvc_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
        @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG)
@@ -117,7 +117,7 @@ regressbigarray:
        @echo "Starting tests at" `date` | tee -a $(BIGARRAY_LOG)
        @echo "*********************************************************" \
           | tee -a $(BIGARRAY_LOG)
-       scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(BIGARRAY_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(BIGARRAY_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(BIGARRAY_LOG)
        @echo "Output is saved in $(BIGARRAY_LOG)" | tee -a $(BIGARRAY_LOG)
@@ -132,7 +132,7 @@ regresssmt:
        @echo "Starting tests at" `date` | tee -a $(SMT_LOG)
        @echo "*********************************************************" \
           | tee -a $(SMT_LOG)
-       scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(SMT_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(SMT_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(SMT_LOG)
        @echo "Output is saved in $(SMT_LOG)" | tee -a $(SMT_LOG)
@@ -147,7 +147,7 @@ regresscapi:
        @echo "Starting tests at" `date` | tee -a $(CAPI_LOG)
        @echo "*********************************************************" \
           | tee -a $(CAPI_LOG)
-       $(MAKE) -C tests/c-api-tests 2>&1 | tee -a $(CAPI_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       $(MAKE) -C tests/c-api-tests 2>&1 | tee -a $(CAPI_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(CAPI_LOG)
        @echo "Output is saved in $(CAPI_LOG)" | tee -a $(CAPI_LOG)
@@ -162,7 +162,7 @@ regressstp:
        @echo "Starting tests at" `date` | tee -a $(STP_LOG)
        @echo "*********************************************************" \
           | tee -a $(STP_LOG)
-       scripts/run_stp_tests.pl 2>&1 | tee -a $(STP_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_stp_tests.pl 2>&1 | tee -a $(STP_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(STP_LOG)
        @echo "Output is saved in $(STP_LOG)" | tee -a $(STP_LOG)
@@ -184,7 +184,7 @@ grind:
        @echo "Starting tests at" `date` | tee -a $(GRIND_LOG)
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
-       scripts/run_cvc_tests.pl $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
        @echo "Output is saved in $(GRIND_LOG)" | tee -a $(GRIND_LOG)

diff --git a/scripts/Makefile.common b/scripts/Makefile.common
index ac9e064f5e766cd0ef43c5935764fab1aaebbae7..bd90a590d7b5f8bb27026ad9f7b50a3a5337d3c1 100644 (file)
--- a/scripts/Makefile.common
+++ b/scripts/Makefile.common
@@ -15,6 +15,7 @@ OPTIMIZE = -O3 -DNDEBUG      # Maximum optimization
 CFLAGS_BASE = $(OPTIMIZE)
 #CFLAGS_BASE = $(OPTIMIZE) -DCRYPTOMINISAT
 #CFLAGS_M32  = -m32
+SHELL=/bin/bash
 
 
 # You can compile using make STATIC=true to compile a statically

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 42320f87796f07eb3cbd12d127400b9f797970e3..4e0bb863fa8f513490c3355039b8e6dc696a180c 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -98,7 +98,7 @@ regresscvc:
        @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG)
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
-       scripts/run_cvc_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(REGRESS_LOG)
        @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG)
@@ -117,7 +117,7 @@ regressbigarray:
        @echo "Starting tests at" `date` | tee -a $(BIGARRAY_LOG)
        @echo "*********************************************************" \
           | tee -a $(BIGARRAY_LOG)
-       scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(BIGARRAY_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(BIGARRAY_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(BIGARRAY_LOG)
        @echo "Output is saved in $(BIGARRAY_LOG)" | tee -a $(BIGARRAY_LOG)
@@ -132,7 +132,7 @@ regresssmt:
        @echo "Starting tests at" `date` | tee -a $(SMT_LOG)
        @echo "*********************************************************" \
           | tee -a $(SMT_LOG)
-       scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(SMT_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(SMT_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(SMT_LOG)
        @echo "Output is saved in $(SMT_LOG)" | tee -a $(SMT_LOG)
@@ -147,7 +147,7 @@ regresscapi:
        @echo "Starting tests at" `date` | tee -a $(CAPI_LOG)
        @echo "*********************************************************" \
           | tee -a $(CAPI_LOG)
-       $(MAKE) -C tests/c-api-tests 2>&1 | tee -a $(CAPI_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       $(MAKE) -C tests/c-api-tests 2>&1 | tee -a $(CAPI_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(CAPI_LOG)
        @echo "Output is saved in $(CAPI_LOG)" | tee -a $(CAPI_LOG)
@@ -162,7 +162,7 @@ regressstp:
        @echo "Starting tests at" `date` | tee -a $(STP_LOG)
        @echo "*********************************************************" \
           | tee -a $(STP_LOG)
-       scripts/run_stp_tests.pl 2>&1 | tee -a $(STP_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_stp_tests.pl 2>&1 | tee -a $(STP_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(STP_LOG)
        @echo "Output is saved in $(STP_LOG)" | tee -a $(STP_LOG)
@@ -184,7 +184,7 @@ grind:
        @echo "Starting tests at" `date` | tee -a $(GRIND_LOG)
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
-       scripts/run_cvc_tests.pl $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG); [ $${PIPESTATUS[0]} -eq 0 ]
+       scripts/run_cvc_tests.pl $(GRIND_OPTIONS) 2>&1 | tee -a $(GRIND_LOG);eval [ $${PIPESTATUS[0]} -eq 0 ]
        @echo "*********************************************************" \
           | tee -a $(GRIND_LOG)
        @echo "Output is saved in $(GRIND_LOG)" | tee -a $(GRIND_LOG)