diff options
author | James Laird <jlaird@hdfgroup.org> | 2007-01-23 17:29:45 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2007-01-23 17:29:45 (GMT) |
commit | 59eccdaf699634dfb16419200549268623ac4e9b (patch) | |
tree | af72080ab1b7c00749713e9382b5fc8aa868b18c /src | |
parent | f83826852bc9d1ef530c4d292279396fce77d626 (diff) | |
download | hdf5-59eccdaf699634dfb16419200549268623ac4e9b.zip hdf5-59eccdaf699634dfb16419200549268623ac4e9b.tar.gz hdf5-59eccdaf699634dfb16419200549268623ac4e9b.tar.bz2 |
[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.
Diffstat (limited to 'src')
-rw-r--r-- | src/H5FD.c | 4 | ||||
-rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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. |