Running tester on Windows.

It's been a while since the test cases have been checked in.
With lobo gone, will do primary checks on Windows.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12376 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2017-02-08 20:26:12 +00:00
parent 8d624a7f00
commit d1cf5f96d6

View File

@ -13,15 +13,16 @@
PROGRAM = phreeqc
CFG1 :=`uname`
CFG :=$(shell echo $(CFG1) | sed "s/CYGWIN.*/CYGWIN/")
ifeq ($(CFG), CYGWIN)
SPOOL=>
SPOOL2=2>&1
else
CFG :=$(shell echo $(CFG1) | sed "s/Linux.*/Linux/")
ifeq ($(CFG), Linux)
SPOOL=>&
SPOOL2=
CONCAT=;
else
SPOOL=>
SPOOL2=2>&1
CONCAT=&
endif
all: class_release class_debug
Debug: class_debug
@ -967,8 +968,9 @@ dependencies:
cd $(CLASS_DEBUG_DIR); gcc -MM -I.. -I../PhreeqcKeywords -I../common ../*.cxx ../*.cpp ../PhreeqcKeywords/*.cpp ../common/*.cxx
tester:
cd ../mytest; make clean; make -k -j 1 $(SPOOL) make.out $(SPOOL2); make diff $(SPOOL) diff.out $(SPOOL2)
cd ../examples; make -f Makefile.old clean; make -f Makefile.old -k -j 1 $(SPOOL) make.out $(SPOOL2); make -f Makefile.old diff $(SPOOL) diff.out $(SPOOL2)
# cd ../mytest; make clean; make -k -j 1 $(SPOOL) make.out $(SPOOL2); make diff $(SPOOL) diff.out $(SPOOL2)
cd ../mytest $(CONCAT) make clean $(CONCAT) make -k -j 1 $(SPOOL) make.out $(SPOOL2) $(CONCAT) make diff $(SPOOL) diff.out $(SPOOL2)
cd ../examples $(CONCAT) make -f Makefile.old clean $(CONCAT) make -f Makefile.old -k -j 1 $(SPOOL) make.out $(SPOOL2) $(CONCAT) make -f Makefile.old diff $(SPOOL) diff.out $(SPOOL2)
svn status -q ../mytest
svn status -q ../examples