From 59eccdaf699634dfb16419200549268623ac4e9b Mon Sep 17 00:00:00 2001 From: James Laird Date: Tue, 23 Jan 2007 12:29:45 -0500 Subject: [svn-r13181] Added a configure check to prevent a failure on Cygwin. It seems that while Cygwin supports the time command, it has trouble with the syntax srcdir="../../hdf5/test" time ./testhdf5 and complains. The solution is to test the above case in configure and not to use the time command if it fails; Cygwin is fine with srcdir="../../hdf5/test" ./testhdf5 Tested on Cygwin and kagiso. This feature shouldn't be a major compatibility problem since every platform but Cygwin is already fine with the current syntax. --- Makefile.in | 2 +- c++/Makefile.in | 2 +- c++/examples/Makefile.in | 2 +- c++/src/Makefile.in | 2 +- c++/test/Makefile.in | 2 +- config/commence.am | 1 - configure | 78 ++++++++++++++++++++++++++--------------- configure.in | 20 +++++++++++ examples/Makefile.in | 2 +- fortran/Makefile.in | 2 +- fortran/examples/Makefile.in | 2 +- fortran/src/Makefile.in | 2 +- fortran/test/Makefile.in | 2 +- fortran/testpar/Makefile.in | 2 +- hl/Makefile.in | 2 +- hl/c++/Makefile.in | 2 +- hl/c++/examples/Makefile.in | 2 +- hl/c++/src/Makefile.in | 2 +- hl/c++/test/Makefile.in | 2 +- hl/examples/Makefile.in | 2 +- hl/fortran/Makefile.in | 2 +- hl/fortran/examples/Makefile.in | 2 +- hl/fortran/src/Makefile.in | 2 +- hl/fortran/test/Makefile.in | 2 +- hl/src/Makefile.in | 2 +- hl/test/Makefile.in | 2 +- hl/tools/Makefile.in | 2 +- hl/tools/gif2h5/Makefile.in | 2 +- perform/Makefile.in | 2 +- src/H5FD.c | 4 +-- src/Makefile.in | 2 +- test/Makefile.in | 2 +- testpar/Makefile.in | 2 +- tools/Makefile.in | 2 +- tools/h5copy/Makefile.in | 2 +- tools/h5diff/Makefile.in | 2 +- tools/h5dump/Makefile.in | 2 +- tools/h5import/Makefile.in | 2 +- tools/h5jam/Makefile.in | 2 +- tools/h5ls/Makefile.in | 2 +- tools/h5repack/Makefile.in | 2 +- tools/lib/Makefile.in | 2 +- tools/misc/Makefile.in | 2 +- 43 files changed, 110 insertions(+), 71 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2edbce4..3599700 100644 --- a/Makefile.in +++ b/Makefile.in @@ -237,6 +237,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -300,7 +301,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/c++/Makefile.in b/c++/Makefile.in index 15b76ee..ffc6144 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -207,6 +207,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -270,7 +271,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 9c1978a..41bd789 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 0716a68..5806217 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -239,6 +239,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -302,7 +303,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 920739f..2fa6a03 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -229,6 +229,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -292,7 +293,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/config/commence.am b/config/commence.am index e719710..5f55b8d 100644 --- a/config/commence.am +++ b/config/commence.am @@ -19,7 +19,6 @@ # 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/configure b/configure index c1bdcbf..adf9805 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 13080 2006-12-20 16:22:54Z epourmal . +# From configure.in Id: configure.in 13138 2007-01-12 20:32:34Z koziol . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60 for HDF5 1.8.0-alpha6. # @@ -875,6 +875,7 @@ LT_STATIC_EXEC PERL AR TR +TIME PARALLEL RUNSERIAL RUNPARALLEL @@ -7186,6 +7187,24 @@ echo "$as_me: error: tr program doesn't work" >&2;} fi +{ echo "$as_me:$LINENO: checking if srcdir= and time commands work together" >&5 +echo $ECHO_N "checking if srcdir= and time commands work together... $ECHO_C" >&6; } + + +TIME=time +${TIME} echo 'baz' >& temp.out +TIME_TEST=`grep ^baz temp.out` +rm temp.out +if test "X${TIME_TEST}" = "Xbaz"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + TIME= +fi + + @@ -8129,7 +8148,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8132 "configure"' > conftest.$ac_ext + echo '#line 8151 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10553,11 +10572,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10556: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10575: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10560: \$? = $ac_status" >&5 + echo "$as_me:10579: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10808,11 +10827,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10811: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10830: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10815: \$? = $ac_status" >&5 + echo "$as_me:10834: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10868,11 +10887,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10890: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10875: \$? = $ac_status" >&5 + echo "$as_me:10894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13247,7 +13266,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15631: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15616: \$? = $ac_status" >&5 + echo "$as_me:15635: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15669,11 +15688,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15691: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15676: \$? = $ac_status" >&5 + echo "$as_me:15695: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17167,7 +17186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18142: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18127: \$? = $ac_status" >&5 + echo "$as_me:18146: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18180,11 +18199,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18202: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18187: \$? = $ac_status" >&5 + echo "$as_me:18206: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20263,11 +20282,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20266: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20285: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20270: \$? = $ac_status" >&5 + echo "$as_me:20289: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -20518,11 +20537,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20521: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20540: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20525: \$? = $ac_status" >&5 + echo "$as_me:20544: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -20578,11 +20597,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20581: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20600: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20585: \$? = $ac_status" >&5 + echo "$as_me:20604: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22957,7 +22976,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 diff --git a/configure.in b/configure.in index 66c0a72..8dc69e2 100644 --- a/configure.in +++ b/configure.in @@ -522,6 +522,26 @@ if test "X${TR_TEST}" != "XTEST"; then fi +dnl ---------------------------------------------------------------------- +dnl Check that time can be used with srcdir. This is okay on most systems, +dnl but seems to cause problems on Cygwin. +dnl The solution on Cygwin is not to record execution time for tests. +AC_MSG_CHECKING([if srcdir= and time commands work together]) + +AC_SUBST([TIME]) +TIME=time +dnl TIME_TEST=`foo="bar" ${TIME} echo 'baz' | grep ^baz` +${TIME} echo 'baz' >& temp.out +TIME_TEST=`grep ^baz temp.out` +rm temp.out +if test "X${TIME_TEST}" = "Xbaz"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) + TIME= +fi + + dnl The following variables are used to distinguish between building a dnl serial and parallel library. dnl diff --git a/examples/Makefile.in b/examples/Makefile.in index ef7cdd9..b1597a3 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 9a7b789..bdfe73b 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -211,6 +211,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -274,7 +275,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index d2f1359..04b5775 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 33b6661..507830b 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -264,6 +264,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -327,7 +328,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 61e8c6f..855a15c 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -258,6 +258,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -321,7 +322,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 8fae43f..093ec01 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -221,6 +221,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -284,7 +285,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/Makefile.in b/hl/Makefile.in index d6b9c17..640452b 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -211,6 +211,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -274,7 +275,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index d8a619f..4c07671 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -207,6 +207,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -270,7 +271,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 789b94d..af034d7 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 808f067..c942809 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -228,6 +228,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -291,7 +292,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 0d9aa58..4650ac6 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -223,6 +223,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -286,7 +287,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 71a85fc..3fae85b 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index f54e510..6f76744 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -211,6 +211,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -274,7 +275,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index c5633e8..f2c754a 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -204,6 +204,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -267,7 +268,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 07c42cf..f587f60 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -231,6 +231,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -294,7 +295,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 38646db..c58c959 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -293,7 +294,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 810c956..d4c348d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -229,6 +229,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -292,7 +293,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index a93e437..3978b7b 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -247,6 +247,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -310,7 +311,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 021c441..2191fee 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -208,6 +208,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -271,7 +272,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 15f2cfb..874e4b7 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -232,6 +232,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -295,7 +296,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/perform/Makefile.in b/perform/Makefile.in index 7a2adb6..47525cf 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -259,6 +259,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -322,7 +323,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/src/H5FD.c b/src/H5FD.c index 95dad3e..a2e0cb1 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -2847,7 +2847,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type) haddr_t ret_value; FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF) - H5TRACE1("a", "x", file); + H5TRACE2("a", "xMt", file, type); /* Check args */ if(!file || !file->cls) @@ -2936,7 +2936,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDset_eoa, FAIL) - H5TRACE2("e", "xa", file, addr); + H5TRACE3("e", "xMta", file, type, addr); /* Check args */ if(!file || !file->cls) diff --git a/src/Makefile.in b/src/Makefile.in index 66dc381..fd49c21 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -276,6 +276,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -339,7 +340,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/test/Makefile.in b/test/Makefile.in index 7e6dbea..94b9111 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -489,6 +489,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -552,7 +553,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/testpar/Makefile.in b/testpar/Makefile.in index b07347e..f7a52ed 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -248,6 +248,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -311,7 +312,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/Makefile.in b/tools/Makefile.in index 66926a0..275791d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -208,6 +208,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -271,7 +272,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index d08769f..24b03ae 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -293,7 +294,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index d289b1a..5d1b307 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -237,6 +237,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -300,7 +301,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index e969b93..8588f3e 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -235,6 +235,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -298,7 +299,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 84f9eb1..41045ad 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -230,6 +230,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -293,7 +294,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index e86dffe..fa826f1 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -241,6 +241,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -304,7 +305,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index af8cfde..d9b0e9b 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -223,6 +223,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -286,7 +287,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 65c3ae2..5dcda8a 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -246,6 +246,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -309,7 +310,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 1d78ff6..a3f37a3 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -227,6 +227,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -290,7 +291,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index fab6331..cf81fc0 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -248,6 +248,7 @@ SIZE_T = @SIZE_T@ STATIC_SHARED = @STATIC_SHARED@ STRIP = @STRIP@ TESTPARALLEL = @TESTPARALLEL@ +TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ @@ -311,7 +312,6 @@ target_alias = @target_alias@ # Shell commands used in Makefiles RM = rm -f CP = cp -TIME = time # Some machines need a command to run executables; this is that command # so that our tests will run. -- cgit v0.12