[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.

5 files changed, 10 insertions, 35 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 4d15f60..447c523 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -721,13 +721,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.
@@ -762,6 +755,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
@@ -800,6 +794,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index b878739..26931f6 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -633,13 +633,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.
@@ -674,6 +667,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
@@ -712,6 +706,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 60276ee..98f6209 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -917,13 +917,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.
@@ -958,6 +951,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
@@ -996,6 +990,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/fortran/test/Makefile.in b/fortran/test/Makefile.in
index f55e2a7..a02a7c9 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -887,13 +887,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.
@@ -928,6 +921,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
@@ -966,6 +960,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 7696cdd..06bb739 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -648,13 +648,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.
@@ -689,6 +682,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
@@ -727,6 +721,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