diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:35:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:35:33 (GMT) |
| commit | d6ecc0d44841cc7248b5eb36c20c3a7e7b33b9e6 (patch) | |
| tree | b579914f65ecd6652ba7f7be74b25881672f7f41 /windows | |
| parent | f4e7559bd2d8bbd59535cbcafab78e162a6bffb6 (diff) | |
| download | hdf5-d6ecc0d44841cc7248b5eb36c20c3a7e7b33b9e6.zip hdf5-d6ecc0d44841cc7248b5eb36c20c3a7e7b33b9e6.tar.gz hdf5-d6ecc0d44841cc7248b5eb36c20c3a7e7b33b9e6.tar.bz2 | |
[svn-r20408] Description:
Bring r20382:20407 from trunk to revise_chunks branch.
Tested on:
Linux/32 2.6 (chicago) w/C++
Diffstat (limited to 'windows')
| -rwxr-xr-x | windows/src/H5pubconf.h | 6 | ||||
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index d86e76f..eed67b4 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -483,13 +483,13 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.80-FA_a5" +#define H5_PACKAGE_STRING "HDF5 1.9.81-FA_a5" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.9.80-FA_a5" +#define H5_PACKAGE_VERSION "1.9.81-FA_a5" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "I64" @@ -646,7 +646,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.9.80-FA_a5" +#define H5_VERSION "1.9.81-FA_a5" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index e960dd7..9b73b60 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -602,8 +602,8 @@ rem ############################################################################ rem 11. floating point comparison
rem Not tested on Windows due to difference in formatting of scientific
- rem notation --SJW 8/23/07
- call :testing h5diff_101.txt -v %srcfile1% %srcfile1% g1/d1 g1/d2
+ rem notation (101, 102) --SJW 8/23/07
+ call :testing %h5diff% -v %srcfile1% %srcfile1% g1/d1 g1/d2
rem call :tooltest h5diff_101.txt -v %file1% %file1% g1/d1 g1/d2
call :results -SKIP-
@@ -611,6 +611,16 @@ rem ############################################################################ rem call :tooltest h5diff_102.txt -v %file1% %file1% g1/fp1 g1/fp2
call :results -SKIP-
+ rem Not tested on Windows due to difference in formatting of scientific
+ rem notation with other OS. printf("%g") (103, 104)
+ call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1% g1/d1 g1/d2
+ rem call :tooltest h5diff_103.txt -v --use-system-epsilon %file1% %file1% g1/d1 g1/d2
+ call :results -SKIP-
+
+ call :testing %h5diff% -v --use-system-epsilon %srcfile1% %srcfile1% g1/fp1 g1/fp2
+ rem call :tooltest h5diff_102.txt -v --use-system-epsilon %file1% %file1% g1/fp1 g1/fp2
+ call :results -SKIP-
+
rem New option added #1368(E1) - ADB 2/5/2009
rem not compable -c flag
call :testing %h5diff% %srcfile2% %srcfile2% g2/dset1 g2/dset2
|