diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2005-08-08 17:30:23 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2005-08-08 17:30:23 (GMT) |
| commit | fbb2dd8545d2fa273e948ee589c05f739d5b0362 (patch) | |
| tree | a0b8f6d16d3f62d2cafde7e2ea0578ec2e70e73b /hl/c++ | |
| parent | 1b760b2fd52f0a84af2353e8e7a83dd2686ddc23 (diff) | |
| download | hdf5-fbb2dd8545d2fa273e948ee589c05f739d5b0362.zip hdf5-fbb2dd8545d2fa273e948ee589c05f739d5b0362.tar.gz hdf5-fbb2dd8545d2fa273e948ee589c05f739d5b0362.tar.bz2 | |
[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.
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/Makefile.in | 9 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 9 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 9 |
3 files changed, 6 insertions, 21 deletions
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 |