From f01949f8a16f03a4b4e107594b859acce25b548b Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 7 Jul 2006 18:09:00 +0000 Subject: [PATCH] Made the testing process alot less verbose. Hopefully, the bottom line pass/fail result will now be more evident. --- test_problems/cathermo/DH_graph_1/Makefile.in | 4 +-- .../cathermo/HMW_graph_CpvT/Makefile.in | 4 +-- .../cathermo/HMW_graph_GvT/.cvsignore | 2 +- .../cathermo/HMW_graph_GvT/Makefile.in | 4 +-- .../cathermo/HMW_graph_HvT/Makefile.in | 4 +-- .../cathermo/HMW_graph_VvT/Makefile.in | 4 +-- test_problems/cathermo/HMW_test_1/Makefile.in | 4 +-- test_problems/cathermo/HMW_test_3/Makefile.in | 6 ++-- test_problems/cathermo/Makefile.in | 28 +++++++++---------- test_problems/cathermo/ims/Makefile.in | 4 +-- test_problems/cathermo/issp/Makefile.in | 4 +-- test_problems/cathermo/testIAPWS/Makefile.in | 4 +-- .../cathermo/testIAPWSPres/Makefile.in | 4 +-- .../cathermo/testIAPWSTripP/Makefile.in | 4 +-- .../cathermo/testWaterPDSS/Makefile.in | 4 +-- .../cathermo/testWaterTP/Makefile.in | 4 +-- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/test_problems/cathermo/DH_graph_1/Makefile.in b/test_problems/cathermo/DH_graph_1/Makefile.in index 2703c6e30..e3bc69103 100644 --- a/test_problems/cathermo/DH_graph_1/Makefile.in +++ b/test_problems/cathermo/DH_graph_1/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in index 9bac62d28..77d5eb64e 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in @@ -103,9 +103,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_graph_GvT/.cvsignore b/test_problems/cathermo/HMW_graph_GvT/.cvsignore index aa44ea6f1..80f28d7d5 100644 --- a/test_problems/cathermo/HMW_graph_GvT/.cvsignore +++ b/test_problems/cathermo/HMW_graph_GvT/.cvsignore @@ -8,4 +8,4 @@ diff_test.out output.txt outputa.txt sortAlgorithms.d - +csvCode.txt diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.in b/test_problems/cathermo/HMW_graph_GvT/Makefile.in index 83365cf00..5f162fc9a 100644 --- a/test_problems/cathermo/HMW_graph_GvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.in @@ -103,9 +103,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in index fceafb1b8..b088381a7 100644 --- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in @@ -103,9 +103,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in index 506765552..8c086e038 100644 --- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in @@ -103,9 +103,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_test_1/Makefile.in b/test_problems/cathermo/HMW_test_1/Makefile.in index 74a211d9f..49a35854c 100644 --- a/test_problems/cathermo/HMW_test_1/Makefile.in +++ b/test_problems/cathermo/HMW_test_1/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/HMW_test_3/Makefile.in b/test_problems/cathermo/HMW_test_3/Makefile.in index a5b459f15..879f11b0d 100644 --- a/test_problems/cathermo/HMW_test_3/Makefile.in +++ b/test_problems/cathermo/HMW_test_3/Makefile.in @@ -78,7 +78,7 @@ DEPENDS=$(OBJS:.o=.d) # Program Name PROGRAM = $(PROG_NAME)$(EXE_EXT) -all: $(PROGRAM) .depends +all: .depends $(PROGRAM) $(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a \ $(CANTERA_LIBDIR)/libcaThermo.a @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/Makefile.in b/test_problems/cathermo/Makefile.in index 27ea20dd6..b6dab2902 100644 --- a/test_problems/cathermo/Makefile.in +++ b/test_problems/cathermo/Makefile.in @@ -33,20 +33,20 @@ ifeq ($(test_issp),1) cd issp; @MAKE@ test endif ifeq ($(test_electrolytes),1) - cd ims; @MAKE@ test - cd testIAPWS; @MAKE@ test - cd testIAPWSPres; @MAKE@ test - cd testIAPWSTripP; @MAKE@ test - cd testWaterPDSS; @MAKE@ test - cd testWaterTP; @MAKE@ test - cd HMW_graph_GvT; @MAKE@ test - cd HMW_graph_GvI; @MAKE@ test - cd HMW_graph_HvT; @MAKE@ test - cd HMW_graph_CpvT; @MAKE@ test - cd HMW_graph_VvT; @MAKE@ test - cd HMW_test_1; @MAKE@ test - cd HMW_test_3; @MAKE@ test - cd DH_graph_1; @MAKE@ test + cd ims; @MAKE@ -s test + cd testIAPWS; @MAKE@ -s test + cd testIAPWSPres; @MAKE@ -s test + cd testIAPWSTripP; @MAKE@ -s test + cd testWaterPDSS; @MAKE@ -s test + cd testWaterTP; @MAKE@ -s test + cd HMW_graph_GvT; @MAKE@ -s test + cd HMW_graph_GvI; @MAKE@ -s test + cd HMW_graph_HvT; @MAKE@ -s test + cd HMW_graph_CpvT; @MAKE@ -s test + cd HMW_graph_VvT; @MAKE@ -s test + cd HMW_test_1; @MAKE@ -s test + cd HMW_test_3; @MAKE@ -s test + cd DH_graph_1; @MAKE@ -s test endif clean: diff --git a/test_problems/cathermo/ims/Makefile.in b/test_problems/cathermo/ims/Makefile.in index 0337068c0..c64b09ded 100644 --- a/test_problems/cathermo/ims/Makefile.in +++ b/test_problems/cathermo/ims/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in index 35f9955b8..eeb061c6f 100644 --- a/test_problems/cathermo/issp/Makefile.in +++ b/test_problems/cathermo/issp/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/testIAPWS/Makefile.in b/test_problems/cathermo/testIAPWS/Makefile.in index 088d67754..bbff5fa1d 100755 --- a/test_problems/cathermo/testIAPWS/Makefile.in +++ b/test_problems/cathermo/testIAPWS/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.in b/test_problems/cathermo/testIAPWSPres/Makefile.in index 602414300..7c420e0c2 100755 --- a/test_problems/cathermo/testIAPWSPres/Makefile.in +++ b/test_problems/cathermo/testIAPWSPres/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.in b/test_problems/cathermo/testIAPWSTripP/Makefile.in index 1d658e1db..528c66bac 100755 --- a/test_problems/cathermo/testIAPWSTripP/Makefile.in +++ b/test_problems/cathermo/testIAPWSTripP/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.in b/test_problems/cathermo/testWaterPDSS/Makefile.in index b9485b35b..6315ac228 100755 --- a/test_problems/cathermo/testWaterPDSS/Makefile.in +++ b/test_problems/cathermo/testWaterPDSS/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends diff --git a/test_problems/cathermo/testWaterTP/Makefile.in b/test_problems/cathermo/testWaterTP/Makefile.in index 6bad84652..9d7ae78d7 100644 --- a/test_problems/cathermo/testWaterTP/Makefile.in +++ b/test_problems/cathermo/testWaterTP/Makefile.in @@ -99,9 +99,9 @@ depends: test: ifeq ($(os_is_win), 1) else - @MAKE@ $(PROGRAM) + @ @MAKE@ -s $(PROGRAM) endif - ./runtest + @ ./runtest clean: $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends