From 29e9825c93f19c1cc0579d46f6dd03718a35a936 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 3 Feb 2009 16:30:43 -0500
Subject: [svn-r16411] 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

Tested:
 Vista32, XP32, XP64 using VNET, VS2005 VS2008
---
 windows/test/set_extent/set_extent.vcproj      | 8 ++++----
 windows/tools/h5ls/testh5ls.bat                | 6 ++++++
 windows/tools/h5repack/h5repack.bat            | 6 ++++++
 windows_vnet/test/set_extent/set_extent.vcproj | 4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/windows/test/set_extent/set_extent.vcproj b/windows/test/set_extent/set_extent.vcproj
index ac4bc7e..e5a636a 100644
--- a/windows/test/set_extent/set_extent.vcproj
+++ b/windows/test/set_extent/set_extent.vcproj
@@ -73,7 +73,7 @@
 			/>
 			<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="1"
 				SuppressStartupBanner="true"
@@ -166,7 +166,7 @@
 			/>
 			<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="1"
 				SuppressStartupBanner="true"
@@ -259,7 +259,7 @@
 			/>
 			<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="1"
 				SuppressStartupBanner="true"
@@ -352,7 +352,7 @@
 			/>
 			<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="1"
 				SuppressStartupBanner="true"
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 de609ab..5ae1cea 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
@@ -594,6 +596,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"
-- 
cgit v0.12