[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/tools/Makefile.in b/tools/Makefile.in
index 9d76058..a7c1ba9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -693,13 +693,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.
@@ -734,6 +727,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
@@ -772,6 +766,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/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index b4834c9..23d199a 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/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
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 1d2b8f6..6e3fbea 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -731,13 +731,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.
@@ -772,6 +765,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
@@ -810,6 +804,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/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 3d20448..b438350 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -706,13 +706,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.
@@ -747,6 +740,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
@@ -785,6 +779,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/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 5e921ac..bd78a4c 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -701,13 +701,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.
@@ -742,6 +735,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
@@ -780,6 +774,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/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 2d5b1fa..afe795d 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -727,13 +727,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.
@@ -768,6 +761,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
@@ -806,6 +800,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/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index d0c9298..88291f9 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -681,13 +681,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.
@@ -722,6 +715,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
@@ -760,6 +754,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/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index d4588f7..7d2a9d1 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -756,13 +756,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.
@@ -797,6 +790,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
@@ -835,6 +829,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/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 61b65d1..8d0d70a 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -698,13 +698,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.
@@ -739,6 +732,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
@@ -777,6 +771,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/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 1d21a6a..37d54aa 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -789,13 +789,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.
@@ -830,6 +823,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
@@ -868,6 +862,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