diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-11-02 20:14:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-11-02 20:14:08 (GMT) |
| commit | 315eb0a1687071ca5c09e46efd88073bea118348 (patch) | |
| tree | 8b2edd984ff2520a832347675ac175beb3bed393 /windows | |
| parent | a9ca88d1564351db7ca9371eeede12473b26a6a6 (diff) | |
| download | hdf5-315eb0a1687071ca5c09e46efd88073bea118348.zip hdf5-315eb0a1687071ca5c09e46efd88073bea118348.tar.gz hdf5-315eb0a1687071ca5c09e46efd88073bea118348.tar.bz2 | |
[svn-r19715] Description:
Bring r19697:19714 from trunk to revise_chunks branch.
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
Diffstat (limited to 'windows')
| -rwxr-xr-x | windows/src/H5pubconf.h | 6 | ||||
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index 8996113..a354809 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -478,13 +478,13 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.78-FA_a5" +#define H5_PACKAGE_STRING "HDF5 1.9.79-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.78-FA_a5" +#define H5_PACKAGE_VERSION "1.9.79-FA_a5" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "I64" @@ -641,7 +641,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.9.78-FA_a5" +#define H5_VERSION "1.9.79-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 29be753..f745c42 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -58,6 +58,7 @@ set srcexclude1_1=h5diff_exclude1-1.h5 set srcexclude1_2=h5diff_exclude1-2.h5
set srcexclude2_1=h5diff_exclude2-1.h5
set srcexclude2_2=h5diff_exclude2-2.h5
+set src_comp_vl_strs=h5diff_comp_vl_strs.h5
set file1=%indir%\h5diff_basic1.h5
set file2=%indir%\h5diff_basic2.h5
@@ -89,6 +90,7 @@ set exclude1_1=%indir%\h5diff_exclude1-1.h5 set exclude1_2=%indir%\h5diff_exclude1-2.h5
set exclude2_1=%indir%\h5diff_exclude2-1.h5
set exclude2_2=%indir%\h5diff_exclude2-2.h5
+set comp_vl_strs=%indir%\h5diff_comp_vl_strs.h5
rem The tool name
@@ -853,6 +855,12 @@ rem ############################################################################ call :testing %h5diff% -v --exclude-path "/dset3" %srcexclude1_1% %srcexclude1_2% /group1
call :tooltest h5diff_484.txt -v --exclude-path "/dset3" %exclude1_1% %exclude1_2% /group1
+ rem ##############################################################################
+ rem # diff various multiple vlen and fixed strings in a compound type dataset
+ rem ##############################################################################
+ call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs%
+ call :tooltest h5diff_530.txt -v %comp_vl_strs% %comp_vl_strs%
+
rem #######################################################################
rem # END
|