summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-02-03 21:38:14 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-02-03 21:38:14 (GMT)
commit9ada07ef3a98f12fe04cedc331e5f6a4b570b57e (patch)
tree5507f8a20a1c7aec57c22eb4a4ac46fff54a705d
parent285d83cf36a108eea55428da4d213255ed29dd0a (diff)
downloadhdf5-9ada07ef3a98f12fe04cedc331e5f6a4b570b57e.zip
hdf5-9ada07ef3a98f12fe04cedc331e5f6a4b570b57e.tar.gz
hdf5-9ada07ef3a98f12fe04cedc331e5f6a4b570b57e.tar.bz2
[svn-r16412] testh5ls.bat - added tests to match script file from rev 16310
h5repack.bat - added test to match script file from rev 16402 set_extent.vcproj - added WS2_32.lib for change to set_extent from rev 16406 h5pubconf.h - added C99 undef to sync with *nix configuration Tested: Vista32, XP32, XP64 using VNET, VS2005 VS2008
-rwxr-xr-xwindows/src/H5pubconf.h4
-rw-r--r--windows/test/set_extent/set_extent.vcproj17
-rw-r--r--windows/tools/h5ls/testh5ls.bat6
-rw-r--r--windows/tools/h5repack/h5repack.bat6
-rw-r--r--windows_vnet/test/set_extent/set_extent.vcproj4
5 files changed, 26 insertions, 11 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 (
diff --git a/windows_vnet/test/set_extent/set_extent.vcproj b/windows_vnet/test/set_extent/set_extent.vcproj
index 553ad3d..d7388cd 100644
--- a/windows_vnet/test/set_extent/set_extent.vcproj
+++ b/windows_vnet/test/set_extent/set_extent.vcproj
@@ -38,7 +38,7 @@
Name="VCCustomBuildTool"/>
<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=".\../../../test/set_extent/Debug/set_extent.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
Name="VCCustomBuildTool"/>
<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=".\../../../test/set_extent/Release/set_extent.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"