diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-11-14 17:14:18 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-11-14 17:14:18 (GMT) |
| commit | b315a659a23a4d6e91847832b259ae21e3f9c490 (patch) | |
| tree | e81b66507646f2858a5d486ca3dc63b35ba3f898 | |
| parent | f8bf6c3a1e549d28c60a5d2adee1e6d64d187367 (diff) | |
| parent | 10a9fb5319ab0dcd0e14e40a8ab5c38e8211f764 (diff) | |
| download | hdf5-b315a659a23a4d6e91847832b259ae21e3f9c490.zip hdf5-b315a659a23a4d6e91847832b259ae21e3f9c490.tar.gz hdf5-b315a659a23a4d6e91847832b259ae21e3f9c490.tar.bz2 | |
Merge pull request #776 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '10a9fb5319ab0dcd0e14e40a8ab5c38e8211f764':
Remove extra '&'s that cause syntax errors on Macs.
| -rw-r--r-- | config/conclude.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config/conclude.am b/config/conclude.am index 97aef27..4bdbb0b 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -126,40 +126,40 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: echo "No need to test $${tname} again."; \ else \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "============================" |& tee $${log}; \ + echo "============================" | tee $${log}; \ else \ echo "============================" > $${log}; \ fi; \ if test "X$(FORTRAN_API)" = "Xyes"; then \ echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" |& tee -a $${log}; \ + echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log}; \ else \ echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ fi; \ elif test "X$(CXX_API)" = "Xyes"; then \ echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" |& tee -a $${log};\ + echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log};\ else \ echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ fi; \ else \ echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" |& tee -a $${log}; \ + echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log}; \ else \ echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ fi; \ fi; \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "============================" |& tee -a $${log}; \ + echo "============================" | tee -a $${log}; \ else \ echo "============================" >> $${log}; \ fi; \ if test -n "$(REALTIMEOUTPUT)"; then \ srcdir="$(srcdir)" \ - $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) |& tee -a $${log} 2>&1 \ + $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) | tee -a $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -172,8 +172,8 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "" >> $${log}; \ if test -n "$(REALTIMEOUTPUT)"; then \ - echo "Finished testing $${tname} $(TEST_FLAGS)" |& tee -a $${log}; \ - echo "============================" |& tee -a $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" | tee -a $${log}; \ + echo "============================" | tee -a $${log}; \ else \ echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ echo "============================" >> $${log}; \ |