diff options
| -rw-r--r-- | c++/config/commence.in | 1 | ||||
| -rw-r--r-- | c++/config/conclude.in | 4 | ||||
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 8 | ||||
| -rw-r--r-- | config/powerpc-ibm-aix5.x | 2 | ||||
| -rw-r--r-- | fortran/config/commence.in | 1 | ||||
| -rw-r--r-- | fortran/config/conclude.in | 10 | ||||
| -rw-r--r-- | fortran/config/powerpc-ibm-aix5.x | 2 |
8 files changed, 16 insertions, 13 deletions
diff --git a/c++/config/commence.in b/c++/config/commence.in index 17e5c65..62e3f11 100644 --- a/c++/config/commence.in +++ b/c++/config/commence.in @@ -32,6 +32,7 @@ CP=cp INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ +TIME=time TRACE=: ## Installation points diff --git a/c++/config/conclude.in b/c++/config/conclude.in index 4dcbc80..37fa322 100644 --- a/c++/config/conclude.in +++ b/c++/config/conclude.in @@ -51,7 +51,7 @@ _check-s: tests echo "====================================="; \ echo ""; \ srcdir="$(srcdir)" \ - ./$$test $(TEST_FLAGS) || \ + $(TIME) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ fi; \ @@ -65,7 +65,7 @@ _check-s: tests echo "====================================="; \ echo ""; \ srcdir="$(srcdir)" \ - /bin/sh $$test $(TEST_FLAGS) || \ + $(TIME) /bin/sh $$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ fi; \ diff --git a/config/commence.in b/config/commence.in index cd7e145..cba5db7 100644 --- a/config/commence.in +++ b/config/commence.in @@ -36,6 +36,7 @@ PARALLEL=@PARALLEL@ RUNSERIAL=@RUNSERIAL@ RUNPARALLEL=@RUNPARALLEL@ RUNTEST=$(RUNSERIAL) +TIME=time TRACE=: ## Installation points diff --git a/config/conclude.in b/config/conclude.in index 9dd57d3..e4cf5ea 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -61,7 +61,7 @@ _check-s: tests echo "Testing $$test $(TEST_FLAGS)"; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(TIME) $(RUNTEST) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ @@ -75,7 +75,7 @@ _check-s: tests echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - /bin/sh $$test $(TEST_FLAGS) || \ + $(TIME) /bin/sh $$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ @@ -101,7 +101,7 @@ _check-p: tests echo "Testing $$test $(TEST_FLAGS)"; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNPARALLEL) ./$$test $(TEST_FLAGS) || \ + $(TIME) $(RUNPARALLEL) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ @@ -115,7 +115,7 @@ _check-p: tests echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - /bin/sh $$test $(TEST_FLAGS) || \ + $(TIME) /bin/sh $$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index 50761aa..39e3f8b 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 diff --git a/fortran/config/commence.in b/fortran/config/commence.in index f291361..6946fd2 100644 --- a/fortran/config/commence.in +++ b/fortran/config/commence.in @@ -40,6 +40,7 @@ PARALLEL=@PARALLEL@ RUNSERIAL=@RUNSERIAL@ RUNPARALLEL=@RUNPARALLEL@ RUNTEST=$(RUNSERIAL) +TIME=time TRACE=: ## Installation points diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in index 3e79bfa..2de796f 100644 --- a/fortran/config/conclude.in +++ b/fortran/config/conclude.in @@ -46,7 +46,7 @@ _check-s: tests echo "Testing $$test $(TEST_FLAGS)"; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(TIME) $(RUNTEST) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ @@ -60,7 +60,7 @@ _check-s: tests echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - /bin/sh $$test $(TEST_FLAGS) || \ + $(TIME) /bin/sh $$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ @@ -86,21 +86,21 @@ _check-p: tests echo "Testing $$test $(TEST_FLAGS)"; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNPARALLEL) ./$$test $(TEST_FLAGS) || \ + $(TIME) $(RUNPARALLEL) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ fi; \ done; \ test $$test = dummy || false - @for test in $(TEST_SCRIPTS_PARA) dummy; do \ + @for test in $(TEST_SCRIPTS_PARA) dummy; do \ if test $$test != dummy; then \ echo "============================"; \ echo "Testing $$test $(TEST_FLAGS)"; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - /bin/sh $$test $(TEST_FLAGS) || \ + $(TIME) /bin/sh $$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x index f463491..570fe0c 100644 --- a/fortran/config/powerpc-ibm-aix5.x +++ b/fortran/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 |