diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-24 00:33:09 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-24 00:33:09 (GMT) |
commit | e5d9761abad0b613eaa99b7bbced6cad20e917bd (patch) | |
tree | 44ea85c659cb25f3f1a93392f1d703953120461a /test/mtime.c | |
parent | 3de1ecd9c8f376523f4d4fe5a5c2f265e246bdde (diff) | |
download | hdf5-e5d9761abad0b613eaa99b7bbced6cad20e917bd.zip hdf5-e5d9761abad0b613eaa99b7bbced6cad20e917bd.tar.gz hdf5-e5d9761abad0b613eaa99b7bbced6cad20e917bd.tar.bz2 |
[svn-r19283] Description:
Bring r19278 from trunk to 1.8 branch:
More fixes to memory allocation, etc. exposed by valgrind.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'test/mtime.c')
-rw-r--r-- | test/mtime.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/mtime.c b/test/mtime.c index f28c3e4..9001925 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -99,7 +99,7 @@ main(void) if(H5Fclose(file) < 0) TEST_ERROR; /* Compare addresses & times from the two ways of calling H5Oget_info() */ - if(oi1.addr != oi2.addr || oi1.mtime != oi2.mtime) { + if(oi1.addr != oi2.addr || oi1.ctime != oi2.ctime) { H5_FAILED(); puts(" Calling H5Oget_info() with the dataset ID returned"); puts(" different values than calling it with a file and dataset"); @@ -108,15 +108,15 @@ main(void) } /* Compare times -- they must be within 60 seconds of one another */ - if(0 == oi1.mtime) { + if(0 == oi1.ctime) { SKIPPED(); puts(" The modification time could not be decoded on this OS."); puts(" Modification times will be mantained in the file but"); puts(" cannot be queried on this system. See H5O_mtime_decode()."); return 0; - } else if(HDfabs(HDdifftime(now, oi1.mtime)) > 60.0) { + } else if(HDfabs(HDdifftime(now, oi1.ctime)) > 60.0) { H5_FAILED(); - tm = HDlocaltime(&(oi1.mtime)); + tm = HDlocaltime(&(oi1.ctime)); HDstrftime((char*)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm); tm = HDlocaltime(&now); HDstrftime((char*)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm); @@ -144,7 +144,7 @@ main(void) if(file >= 0){ if(H5Oget_info_by_name(file, "/Dataset1", &oi1, H5P_DEFAULT) < 0) TEST_ERROR; - if(oi1.mtime != MTIME1) { + if(oi1.ctime != MTIME1) { H5_FAILED(); /* If this fails, examine H5Omtime.c. Modification time is very * system dependant (e.g., on Windows DST must be hardcoded). */ @@ -180,7 +180,7 @@ main(void) if(file >= 0){ if(H5Oget_info_by_name(file, "/Dataset1", &oi2, H5P_DEFAULT) < 0) TEST_ERROR; - if(oi2.mtime != MTIME2) { + if(oi2.ctime != MTIME2) { H5_FAILED(); puts(" Modification time incorrect."); goto error; |