From 07bc2df7cc11e8822eb127076309f4265365a371 Mon Sep 17 00:00:00 2001 From: vijay_ganesh Date: Fri, 14 Aug 2009 17:02:47 +0000 Subject: [PATCH] git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@133 e59a4935-1847-0410-ae03-e826735625c1 --- scripts/Makefile.in | 17 ++++++----------- scripts/configure | 6 +++--- src/AST/Makefile | 2 +- src/bitvec/Makefile | 2 +- src/c_interface/Makefile | 2 +- src/constantbv/Makefile | 2 +- src/parser/Makefile | 2 +- src/simplifier/Makefile | 2 +- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 52c5802..9b84ae4 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -4,7 +4,7 @@ # To make in optimized mode, type 'make "OPTIMIZE=-O3" -include make-scripts/Makefile.common make-scripts/config.info +include scripts/Makefile.common scripts/config.info BIN_DIR=$(PREFIX)/bin LIB_DIR=$(PREFIX)/lib @@ -69,8 +69,6 @@ TAGS: FORCE FORCE: # The higher the level, the more tests are run (3 = all) -REGRESS_TESTS0 = test \ - test/EGT REGRESS_LEVEL=4 REGRESS_TESTS=$(REGRESS_TESTS0) REGRESS_LOG = `date +%Y-%m-%d`"-regress.log" @@ -84,7 +82,7 @@ regress: @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG) @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) - bin/run_tests $(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); [ $${PIPESTATUS[0]} -eq 0 ] @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG) @@ -92,8 +90,6 @@ regress: | tee -a $(REGRESS_LOG) # The higher the level, the more tests are run (3 = all) -REGRESS_TESTS0 = test \ - test/EGT REGRESS_LEVEL=4 REGRESS_TESTS=$(REGRESS_TESTS0) #REGRESS_LOG = `date +%Y-%m-%d`"-regress-bigarray.log" @@ -107,7 +103,7 @@ regressbigarray: @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG) @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) - bin/run_bigarray_tests $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ] + scripts/run_bigarray_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ] @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG) @@ -121,7 +117,7 @@ regress_smt: @echo "Starting tests at" `date` | tee -a $(REGRESS_LOG) @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) - bin/run_smt_tests $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ] + scripts/run_smt_tests.pl $(ALL_OPTIONS) 2>&1 | tee -a $(REGRESS_LOG); [ $${PIPESTATUS[0]} -eq 0 ] @echo "*********************************************************" \ | tee -a $(REGRESS_LOG) @echo "Output is saved in $(REGRESS_LOG)" | tee -a $(REGRESS_LOG) @@ -149,10 +145,9 @@ grind: @echo "Starting tests at" `date` | tee -a $(GRIND_LOG) @echo "*********************************************************" \ | tee -a $(GRIND_LOG) - bin/run_tests $(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); [ $${PIPESTATUS[0]} -eq 0 ] @echo "*********************************************************" \ | tee -a $(GRIND_LOG) @echo "Output is saved in $(GRIND_LOG)" | tee -a $(GRIND_LOG) @echo "*********************************************************" \ - | tee -a $(GRIND_LOG) - + | tee -a $(GRIND_LOG) \ No newline at end of file diff --git a/scripts/configure b/scripts/configure index 016a02d..13075a6 100755 --- a/scripts/configure +++ b/scripts/configure @@ -32,10 +32,10 @@ while [ $# -gt 0 ]; do done -echo "PREFIX=$PREFIX" > make-scripts/config.info +echo "PREFIX=$PREFIX" > scripts/config.info echo "Setting prefix to... $PREFIX" if [ $CXX ] -then echo "CXX=$CXX" >> make-scripts/config.info +then echo "CXX=$CXX" >> scripts/config.info export CXX="$CXX" echo "Setting CXX to... $CXX" fi @@ -57,7 +57,7 @@ then mkdir $PREFIX/include/stp fi echo "STP is configured successfully." -cp make-scripts/Makefile.in Makefile +cp scripts/Makefile.in Makefile echo echo "Type 'make' to compile STP." diff --git a/src/AST/Makefile b/src/AST/Makefile index 71b4879..3358471 100644 --- a/src/AST/Makefile +++ b/src/AST/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common #SRCS = AST.cpp ASTKind.cpp ASTUtil.cpp BitBlast.cpp SimpBool.cpp ToCNF.cpp DPLLMgr.cpp ToSAT.cpp Transform.cpp SRCS = AST.cpp ASTKind.cpp ASTUtil.cpp BitBlast.cpp SimpBool.cpp ToCNF.cpp ToSAT.cpp Transform.cpp printer/SMTLIBPrinter.cpp printer/dotPrinter.cpp printer/CPrinter.cpp diff --git a/src/bitvec/Makefile b/src/bitvec/Makefile index 6f4c401..1a864f7 100644 --- a/src/bitvec/Makefile +++ b/src/bitvec/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common SRCS = consteval.cpp OBJS = $(SRCS:.cpp=.o) diff --git a/src/c_interface/Makefile b/src/c_interface/Makefile index ab27595..37cf62e 100644 --- a/src/c_interface/Makefile +++ b/src/c_interface/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common SRCS = c_interface.cpp OBJS = $(SRCS:.cpp=.o) diff --git a/src/constantbv/Makefile b/src/constantbv/Makefile index 7d5ef9a..58920ad 100644 --- a/src/constantbv/Makefile +++ b/src/constantbv/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common SRCS = constantbv.cpp OBJS = $(SRCS:.cpp=.o) diff --git a/src/parser/Makefile b/src/parser/Makefile index 82c88c7..43d99ee 100644 --- a/src/parser/Makefile +++ b/src/parser/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common LEX=flex YACC=bison -d -y --debug -v diff --git a/src/simplifier/Makefile b/src/simplifier/Makefile index 030edc5..a486b4d 100644 --- a/src/simplifier/Makefile +++ b/src/simplifier/Makefile @@ -1,4 +1,4 @@ -include ../../make-scripts/Makefile.common +include ../../scripts/Makefile.common SRCS = simplifier.cpp bvsolver.cpp OBJS = $(SRCS:.cpp=.o) -- 2.47.3