diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.am | 1 | ||||
| -rw-r--r-- | config/conclude.am | 4 | ||||
| -rw-r--r-- | config/powerpc-ibm-aix5.x | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config/commence.am b/config/commence.am index 518aa13..ed31102 100644 --- a/config/commence.am +++ b/config/commence.am @@ -5,6 +5,7 @@ # Shell commands used in Makefiles RM=rm -f CP=cp +TIME=time # Hardcode SHELL to be /bin/sh. Most machines have this shell, and # on at least one machine configure fails to detect its existence (janus). diff --git a/config/conclude.am b/config/conclude.am index 79f7e49..20ca133 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -105,7 +105,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "============================" >> $${log}; \ srcdir="$(srcdir)" \ - $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -144,7 +144,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: echo "============================" >> $${log}; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \ && touch `basename $(@:.chkexe_=.chkexe)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index bd9612d..34a8d35 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -18,7 +18,7 @@ fi # Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used. if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then - RUNPARALLEL=${RUNPARALLEL="MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} + RUNPARALLEL=${RUNPARALLEL="env MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} fi |