[svn-r11213] Purpose:

Bug fix and improvement.


Description:
The test output were not displayed for parallel tests.
The serial tests output were always displayed whether the test was
actually ran this time or not.


Solution:
Moved the display of test output inside the target where the actual
tests are run.


Platforms tested:
Tested in heping using pp and fortran.

10 files changed, 20 insertions, 70 deletions

diff --git a/hl/Makefile.in b/hl/Makefile.in
index 4415979..8628ce2 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -688,13 +688,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -729,6 +722,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -767,6 +761,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index ced9341..67646eb 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -691,13 +691,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -732,6 +725,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -770,6 +764,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 2462603..8b89122 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -712,13 +712,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -753,6 +746,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -791,6 +785,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 6aae155..6f08b9a 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -660,13 +660,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -701,6 +694,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -739,6 +733,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 4c73b43..4773657 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -686,13 +686,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -727,6 +720,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -765,6 +759,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 833cb24..7fb21b3 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -733,13 +733,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -774,6 +767,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -812,6 +806,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 4572802..15dbe8c 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -650,13 +650,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -691,6 +684,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -729,6 +723,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 4d4752c..ea344a7 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -700,13 +700,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -741,6 +734,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -779,6 +773,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index d0df0ef..7139119 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -683,13 +683,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -724,6 +717,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -762,6 +756,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index b4834c9..23d199a 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -694,13 +694,6 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
-	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
-	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
-	   if test $$d != dummy && test $$d != .log &&               \
-	                           test $$d != .logsh; then          \
-	      cat `basename $$d`;                                    \
-	   fi;                                                       \
-	done
 
 # The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
@@ -735,6 +728,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi
@@ -773,6 +767,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \
 	      echo "============================" >> $${log}; \
 	      echo "Finished testing $${tname} $(TEST_FLAGS)"; \
+	      cat $${log}; \
 	   fi; \
 	   echo "============================"; \
 	fi