diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-03 23:26:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-03 23:26:42 (GMT) |
| commit | 7e67d1f00da21ed8dc60ca36444a67cb12d18a18 (patch) | |
| tree | 89d5050f6c03a07e45f934efaadabb12b7253faf /windows | |
| parent | 5436f45bd11f2867b3c9e93b976df427a0ffb10e (diff) | |
| download | hdf5-7e67d1f00da21ed8dc60ca36444a67cb12d18a18.zip hdf5-7e67d1f00da21ed8dc60ca36444a67cb12d18a18.tar.gz hdf5-7e67d1f00da21ed8dc60ca36444a67cb12d18a18.tar.bz2 | |
[svn-r16413] Description:
Bring r16402:16412 from trunk back to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty)
(h5committest not required for this branch)
Diffstat (limited to 'windows')
| -rwxr-xr-x | windows/src/H5pubconf.h | 4 | ||||
| -rw-r--r-- | windows/test/set_extent/set_extent.vcproj | 17 | ||||
| -rw-r--r-- | windows/tools/h5ls/testh5ls.bat | 6 | ||||
| -rw-r--r-- | windows/tools/h5repack/h5repack.bat | 6 |
4 files changed, 24 insertions, 9 deletions
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index 5c6e550..6639fb5 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -78,6 +78,10 @@ /* Define to 1 if you have the `BSDgettimeofday' function. */ /* #undef H5_HAVE_BSDGETTIMEOFDAY */ +/* Define if the compiler understands C99 designated initialization of structs + and unions */ +/* #undef H5_HAVE_C99_DESIGNATED_INITIALIZER */ + /* Define if the compiler understand the __func__ keyword */ /* #undef H5_HAVE_C99_FUNC */ diff --git a/windows/test/set_extent/set_extent.vcproj b/windows/test/set_extent/set_extent.vcproj index a527461..e5a636a 100644 --- a/windows/test/set_extent/set_extent.vcproj +++ b/windows/test/set_extent/set_extent.vcproj @@ -4,7 +4,6 @@ Version="8.00"
Name="set_extent"
ProjectGUID="{E81413CC-046C-42B0-B862-0BB81AED2854}"
- RootNamespace="set_extent"
>
<Platforms>
<Platform
@@ -74,9 +73,9 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -167,9 +166,9 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
@@ -260,9 +259,9 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../test/set_extent/Release/set_extent.pdb"
@@ -353,9 +352,9 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="0"
+ LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../test/set_extent/Release/set_extent.pdb"
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat index a95975b..469e8df 100644 --- a/windows/tools/h5ls/testh5ls.bat +++ b/windows/tools/h5ls/testh5ls.bat @@ -218,6 +218,12 @@ rem ############################################################################ rem test for non-existing file
call :tooltest nosuchfile.ls 0 nosuchfile.h5
+ rem test for variable length data types in verbose mode
+ call :tooltest tvldtypes2.ls 0 -v tvldtypes1.h5
+
+ rem test for dataset region references data types in verbose mode
+ call :tooltest tdatareg.ls 0 -v tdatareg.h5
+
if %nerrors% equ 0 (
echo.All h5ls tests passed.
)
diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index eb4da34..a2cc9a3 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -61,6 +61,8 @@ set file10=h5repack_fletcher.h5 set file11=h5repack_filters.h5
set file12=h5repack_nbit.h5
set file13=h5repack_soffset.h5
+rem A file with an older version of the layout message (copy of test/tlayouto.h5)
+set file14=h5repack_layouto.h5
set nerrors=0
@@ -593,6 +595,10 @@ rem rem add alignment
set arg=%file1% -t 1 -a 1
call :tooltest %arg%
+
+ rem Check repacking file with old version of layout message (should get upgraded
+ rem to new version and be readable, etc.)
+ call :tooltest %file14%
if %nerrors% equ 0 (
|