[svn-r14138]

author: Scott Wegner <swegner@hdfgroup.org> 2007-09-10 19:14:08 (GMT)
committer: Scott Wegner <swegner@hdfgroup.org> 2007-09-10 19:14:08 (GMT)
commit: 43bb1ba8e53c3eb23448baba68485222514ab992 (patch)
tree: e32be74f0faad61cb3c3b29ead9849be5dc59a4d /windows/test
parent: 33efca34cb30bcf7e17f6e3aa580233bd58a0075 (diff)
download: hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.zip
hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.tar.gz
hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.tar.bz2
9 files changed, 327 insertions, 2219 deletions
diff --git a/windows/test/checktests.bat b/windows/test/checktests.bat
new file mode 100644
index 0000000..197ab04
--- /dev/null
+++ b/windows/test/checktests.bat
@@ -0,0 +1,129 @@
+@echo off
+rem
+rem Copyright by The HDF Group.
+rem Copyright by the Board of Trustees of the University of Illinois.
+rem All rights reserved.
+rem
+rem This file is part of HDF5.  The full HDF5 copyright notice, including
+rem terms governing use, modification, and redistribution, is contained in
+rem the files COPYING and Copyright.html.  COPYING can be found at the root
+rem of the source code distribution tree; Copyright.html can be found at the
+rem root level of an installed copy of the electronic HDF5 document set and
+rem is linked from the top-level documents page.  It can also be found at
+rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+rem access to either file, you may request a copy from help@hdfgroup.org.
+rem
+rem Tests for the hdf5 library
+rem
+rem    Created:  Scott Wegner, 9/4/07
+rem    Modified:
+rem
+
+setlocal enabledelayedexpansion
+pushd %~dp0
+
+rem Clean any variables starting with "HDF5_LIBTEST_", as we use these for our
+rem tests.  Also clear "HDF5_LIBTEST_TESTS", as we will be addding all of our tests
+rem to this variable.
+rem Set at least one variable in set beforehand to avoid error message.
+rem --SJW 9/5/07
+set hdf5_libtest_=foo
+for /f "tokens=1 delims==" %%a in ('set hdf5_libtest_') do set %%a=
+set hdf5_libtest_tests=
+
+goto main
+
+
+rem Function to add a test to the test suite.  
+rem Expects the following parameters:
+rem     %1 - Name of the libtest being tested
+rem     %2 - Relative path of script
+:add_test
+
+    set hdf5_libtest_tests=%hdf5_libtest_tests% %1
+    set hdf5_libtest_%1_test=%CD%\%2\%1
+
+    exit /b
+    
+
+rem Run all of the tests that have been added to the suite.  Print a header
+rem at the beginning of each one.  Short-circuit if a test fails.
+rem Expects the following parameters:
+rem     %1 - release or debug version
+rem     %2 - "dll" or nothing
+:run_tests
+    for %%a in (%hdf5_libtest_tests%) do (
+        echo.
+        echo.************************************
+        echo.  Testing %%a ^(%1 %2^)
+        echo.************************************
+        
+        rem Only add our parameters for batch scripts.
+        call !hdf5_libtest_%%a_test:.bat= %1 %2!
+        rem Exit early if test fails.
+        if !errorlevel! neq 0 exit /b
+    )
+    
+    rem If we get here, that means all of our tests passed.
+    echo.All library tests passed.
+
+    exit /b
+
+
+rem This is where we add tests to the suite, and run them all at the end.
+rem Make sure only to run dll versions of tests you build dll for
+rem Also make sure to add *.bat to batch scripts, as the above functions rely
+rem on it for sending parameters.  --SJW 9/6/07
+:main
+
+    call :add_test testerror.bat .
+    call :add_test testhdf5%2 .\testhdf5%2\%1
+    call :add_test lheap%2 .\lheap%2\%1
+    call :add_test ohdr%2 .\ohdr%2\%1
+    call :add_test stab%2 .\stab%2\%1
+    call :add_test gheap%2 .\gheap%2\%1
+    call :add_test cache%2 .\cache%2\%1
+    call :add_test cache_api%2 .\cache_api%2\%1
+    call :add_test pool%2 .\pool%2\%1
+    call :add_test hyperslab%2 .\hyperslab%2\%1
+    call :add_test istore%2 .\istore%2\%1
+    call :add_test bittests%2 .\bittests%2\%1
+    call :add_test dt_arith%2 .\dt_arith%2\%1
+    call :add_test dtypes%2 .\dtypes%2\%1
+    call :add_test dsets%2 .\dsets%2\%1
+    call :add_test cmpd_dset%2 .\cmpd_dset%2\%1
+    call :add_test extend%2 .\extend%2\%1
+    call :add_test external%2 .\external%2\%1
+    call :add_test objcopy%2 .\objcopy%2\%1
+    call :add_test links%2 .\links%2\%1
+    call :add_test unlink%2 .\unlink%2\%1
+    call :add_test big%2 .\big%2\%1
+    call :add_test mtime%2 .\mtime%2\%1
+    call :add_test fillval%2 .\fillval%2\%1
+    call :add_test mount%2 .\mount%2\%1
+    call :add_test flush1%2 .\flush1%2\%1
+    call :add_test flush2%2 .\flush2%2\%1
+    call :add_test enum%2 .\enum%2\%1
+    call :add_test set_extent%2 .\set_extent%2\%1
+    rem Test commented because threadsafe is not built by default on Windows.
+    rem --SJW 9/5/07
+    rem call :add_test ttsafe%2 .\ttsafe%2\%1
+    rem Test commented because stream driver is not supported on Windows.
+    rem --SJW 9/5/07
+    rem call :add_test stream_test%2 .\stream_test%2\%1
+    call :add_test getname%2 .\getname%2\%1
+    call :add_test vfd%2 .\vfd%2\%1
+    call :add_test ntypes%2 .\ntypes%2\%1
+    call :add_test dangle%2 .\dangle%2\%1
+    call :add_test reserved%2 .\reserved%2\%1
+    call :add_test cross_read%2 .\cross_read%2\%1
+    call :add_test btree2%2 .\btree2%2\%1
+    call :add_test fheap%2 .\fheap%2\%1
+    
+    
+    rem Run the tests, passing in which version to run
+    call :run_tests %*
+        
+    popd
+    endlocal & exit /b
+    
+\ No newline at end of file
diff --git a/windows/test/error_api/error_api.vcproj b/windows/test/error_api/error_api.vcproj
deleted file mode 100644
index 58f28cc..0000000
--- a/windows/test/error_api/error_api.vcproj
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="error_api"
-	ProjectGUID="{7ABA5DD5-77E7-42D3-9C29-84A13B0CAA91}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_api/Release/error_api.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_api/Release/error_api.pch"
-				AssemblerListingLocation=".\../../../test/error_api/Release/"
-				ObjectFile=".\../../../test/error_api/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_api/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libcd.lib"
-				ProgramDatabaseFile=".\../../../test/error_api/Release/error_api.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_api/Release/error_api.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_api/Release/error_api.pch"
-				AssemblerListingLocation=".\../../../test/error_api/Release/"
-				ObjectFile=".\../../../test/error_api/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_api/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libcd.lib"
-				ProgramDatabaseFile=".\../../../test/error_api/Release/error_api.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_api/Debug/error_api.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_api/Debug/error_api.pch"
-				AssemblerListingLocation=".\../../../test/error_api/Debug/"
-				ObjectFile=".\../../../test/error_api/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_api/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_api/Debug/error_api.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_api/Debug/error_api.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_api/Debug/error_api.pch"
-				AssemblerListingLocation=".\../../../test/error_api/Debug/"
-				ObjectFile=".\../../../test/error_api/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_api/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_api/Debug/error_api.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\test\error_test.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/test/error_apidll/error_apidll.vcproj b/windows/test/error_apidll/error_apidll.vcproj
deleted file mode 100644
index 5db808b..0000000
--- a/windows/test/error_apidll/error_apidll.vcproj
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="error_apidll"
-	ProjectGUID="{55894CDC-C220-40FE-B403-D74EAC6EBACF}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_apidll/Debug/error_apidll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_apidll/Debug/error_apidll.pch"
-				AssemblerListingLocation=".\../../../test/error_apidll/Debug/"
-				ObjectFile=".\../../../test/error_apidll/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_apidll/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_apidll/Debug/error_apidll.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_apidll/Debug/error_apidll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_apidll/Debug/error_apidll.pch"
-				AssemblerListingLocation=".\../../../test/error_apidll/Debug/"
-				ObjectFile=".\../../../test/error_apidll/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_apidll/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_apidll/Debug/error_apidll.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_apidll/Release/error_apidll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_apidll/Release/error_apidll.pch"
-				AssemblerListingLocation=".\../../../test/error_apidll/Release/"
-				ObjectFile=".\../../../test/error_apidll/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_apidll/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../../test/error_apidll/Release/error_apidll.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_apidll/Release/error_apidll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_apidll/Release/error_apidll.pch"
-				AssemblerListingLocation=".\../../../test/error_apidll/Release/"
-				ObjectFile=".\../../../test/error_apidll/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_apidll/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../../test/error_apidll/Release/error_apidll.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\test\error_test.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/test/error_compat/error_compat.vcproj b/windows/test/error_compat/error_compat.vcproj
deleted file mode 100644
index c9b6e4a..0000000
--- a/windows/test/error_compat/error_compat.vcproj
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="error_compat"
-	ProjectGUID="{265C41B2-30D7-4FF8-A08C-B997363DA763}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_compat/Debug/error_compat.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compat/Debug/error_compat.pch"
-				AssemblerListingLocation=".\../../../test/error_compat/Debug/"
-				ObjectFile=".\../../../test/error_compat/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_compat/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_compat/Debug/error_compat.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_compat/Debug/error_compat.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compat/Debug/error_compat.pch"
-				AssemblerListingLocation=".\../../../test/error_compat/Debug/"
-				ObjectFile=".\../../../test/error_compat/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_compat/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_compat/Debug/error_compat.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_compat/Release/error_compat.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compat/Release/error_compat.pch"
-				AssemblerListingLocation=".\../../../test/error_compat/Release/"
-				ObjectFile=".\../../../test/error_compat/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_compat/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libcd.lib"
-				ProgramDatabaseFile=".\../../../test/error_compat/Release/error_compat.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_compat/Release/error_compat.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compat/Release/error_compat.pch"
-				AssemblerListingLocation=".\../../../test/error_compat/Release/"
-				ObjectFile=".\../../../test/error_compat/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_compat/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libcd.lib"
-				ProgramDatabaseFile=".\../../../test/error_compat/Release/error_compat.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\test\err_compat.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/test/error_compatdll/error_compatdll.vcproj b/windows/test/error_compatdll/error_compatdll.vcproj
deleted file mode 100644
index f18b15e..0000000
--- a/windows/test/error_compatdll/error_compatdll.vcproj
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="error_compatdll"
-	ProjectGUID="{309CE6F8-4658-44CB-8E99-0B86DCA77EFC}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_compatdll/Debug/error_compatdll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compatdll/Debug/error_compatdll.pch"
-				AssemblerListingLocation=".\../../../test/error_compatdll/Debug/"
-				ObjectFile=".\../../../test/error_compatdll/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_compatdll/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_compatdll/Debug/error_compatdll.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_compatdll/Debug/error_compatdll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compatdll/Debug/error_compatdll.pch"
-				AssemblerListingLocation=".\../../../test/error_compatdll/Debug/"
-				ObjectFile=".\../../../test/error_compatdll/Debug/"
-				ProgramDataBaseFileName=".\../../../test/error_compatdll/Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../../test/error_compatdll/Debug/error_compatdll.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../../test/error_compatdll/Release/error_compatdll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compatdll/Release/error_compatdll.pch"
-				AssemblerListingLocation=".\../../../test/error_compatdll/Release/"
-				ObjectFile=".\../../../test/error_compatdll/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_compatdll/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../../test/error_compatdll/Release/error_compatdll.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="$(OutDir)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../../test/error_compatdll/Release/error_compatdll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\../../../test/error_compatdll/Release/error_compatdll.pch"
-				AssemblerListingLocation=".\../../../test/error_compatdll/Release/"
-				ObjectFile=".\../../../test/error_compatdll/Release/"
-				ProgramDataBaseFileName=".\../../../test/error_compatdll/Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../../test/error_compatdll/Release/error_compatdll.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\..\test\err_compat.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/windows/test/hdf5test.bat b/windows/test/hdf5test.bat
deleted file mode 100755
index 4a93dc7..0000000
--- a/windows/test/hdf5test.bat
+++ /dev/null
@@ -1,306 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-@ECHO OFF
-REM This batch file is used to HDF5 C Library.
-REM Last Modified: 05/19/2005 by Fang GUO
-
-echo ============================
-echo Testing testhdf5 
-echo ============================
-
-testhdf5%2\%1\testhdf5%2
-
-echo ============================
-echo Testing lheap 
-echo ============================
-
-lheap%2\%1\lheap%2
-
-echo.
-echo ============================
-echo Testing ohdr 
-echo ============================
-
-ohdr%2\%1\ohdr%2
-
-echo.
-echo ============================
-echo Testing stab 
-echo ============================
-
-stab%2\%1\stab%2
-
-echo.
-echo ============================
-echo Testing gheap 
-echo ============================
-
-gheap%2\%1\gheap%2
-
-echo.
-echo ============================
-echo Testing cache 
-echo ============================
-
-cache%2\%1\cache%2
-
-echo.
-echo ============================
-echo Testing cache_api
-echo ============================
-
-cache_api%2\%1\cache_api%2
-
-echo.
-echo ============================
-echo Testing btree2 
-echo ============================
-
-btree2%2\%1\btree2%2
-
-echo.
-echo ============================
-echo Testing pool 
-echo ============================
-
-pool%2\%1\pool%2
-
-echo.
-echo ============================
-echo Testing hyperslab 
-echo ============================
-
-hyperslab%2\%1\hyperslab%2
-
-echo.
-echo ============================
-echo Testing istore 
-echo ============================
-
-istore%2\%1\istore%2
-
-echo.
-echo ============================
-echo Testing bittests 
-echo ============================
-
-bittests%2\%1\bittests%2
-
-echo.
-echo ============================
-echo Testing dt_arith 
-echo ============================
-
-dt_arith%2\%1\dt_arith%2
-
-echo.
-echo ============================
-echo Testing dtypes 
-echo ============================
-
-dtypes%2\%1\dtypes%2
-
-echo.
-echo ============================
-echo Testing dsets 
-echo ============================
-
-dsets%2\%1\dsets%2
-
-echo.
-echo ============================
-echo Testing cmpd_dset 
-echo ============================
-
-cmpd_dset%2\%1\cmpd_dset%2
-
-echo.
-echo ============================
-echo Testing extend 
-echo ============================
-
-extend%2\%1\extend%2
-
-echo.
-echo ============================
-echo Testing external 
-echo ============================
-
-external%2\%1\external%2
-
-echo.
-echo ============================
-echo Testing objcopy 
-echo ============================
-
-objcopy%2\%1\objcopy%2
-
-echo.
-echo ============================
-echo Testing links  
-echo ============================
-
-links%2\%1\links%2
-
-echo.
-echo ============================
-echo Testing unlink 
-echo ============================
-
-unlink%2\%1\unlink%2
-
-echo.
-echo ============================
-echo Testing big 
-echo ============================
-
-echo.
-echo Test skipped because it is not supported on Windows.
-echo.
-
-echo ============================
-echo Testing mtime 
-echo ============================
-
-mtime%2\%1\mtime%2
-
-echo.
-echo ============================
-echo Testing fillval 
-echo ============================
-
-fillval%2\%1\fillval%2
-
-echo.
-echo ============================
-echo Testing mount 
-echo ============================
-
-mount%2\%1\mount%2
-
-echo.
-echo ============================
-echo Testing flush1 
-echo ============================
-
-flush1%2\%1\flush1%2
-
-echo.
-echo ============================
-echo Testing flush2 
-echo ============================
-
-flush2%2\%1\flush2%2
-
-echo.
-echo ============================
-echo Testing enum 
-echo ============================
-
-enum%2\%1\enum%2
-
-echo ============================
-echo Testing set_extent 
-echo ============================
-
-set_extent%2\%1\set_extent%2
-
-echo ============================
-echo Testing ttsafe 
-echo ============================
-
-echo.
-echo Test skipped because THREADSAFE is not supported on Windows.
-echo.
-
-echo ============================
-echo Testing stream_test 
-echo ============================
-
-echo.
-echo Test skipped because it is not supported on Windows.
-echo.
-
-echo ============================
-echo Testing getname 
-echo ============================
-
-getname%2\%1\getname%2
-
-echo.
-echo ============================
-echo Testing vfd 
-echo ============================
-
-vfd%2\%1\vfd%2
-
-echo.
-echo ============================
-echo Testing ntypes 
-echo ============================
-
-ntypes%2\%1\ntypes%2
-
-echo.
-echo ============================
-echo Testing dangle 
-echo ============================
-
-dangle%2\%1\dangle%2
-
-echo.
-echo ============================
-echo Testing dtransform 
-echo ============================
-
-dtransform%2\%1\dtransform%2
-
-echo.
-echo ============================
-echo Testing reserved 
-echo ============================
-
-reserved%2\%1\reserved%2
-
-echo.
-echo ============================
-echo Testing cross_read 
-echo ============================
-
-cross_read%2\%1\cross_read%2
-
-echo ============================
-echo Testing fheap 
-echo ============================
-
-fheap%2\%1\fheap%2
-
-
-echo.
-echo ============================
-echo Testing ./testerr.bat  
-echo ============================
-echo Test skipped because sed is not universal supported.
-echo To test the HDF5 error API, you need to have sed on your machine.
-echo Please remove echo on the following line in this batch file to do the test.
-echo.
-
-echo call testerr %1 %2
-echo.
-echo ============================
-echo Testing talign 
-echo ============================
-
-..\tools\talign%2\%1\talign%2
-
diff --git a/windows/test/hdf5timingtest.bat b/windows/test/hdf5timingtest.bat
deleted file mode 100755
index 08f4368..0000000
--- a/windows/test/hdf5timingtest.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-chunk%2\%1\chunk%2
-
-iopipe%2\%1\iopipe%2
-
-overhead%2\%1\overhead%2
-
diff --git a/windows/test/testerr.bat b/windows/test/testerr.bat
deleted file mode 100644
index 18c1e61..0000000
--- a/windows/test/testerr.bat
+++ /dev/null
@@ -1,74 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-@REM This batch file tests HDF5 error API and backward compatibility with 1.6.
-@REM If you want to use 1.8 with 1.6 compatibility,To the functionality of error APIs, 
-@REM You need to do the following two things:
-@REM 1. Uncomment out /*#define H5_WANT_H5_V1_6_COMPAT 1*/ inside h5pubconf.h.
-@REM 2. Set up an environment variable H5_WANT_H5_V1_6_COMPAT to 1
-@REM Remember to undo 1 and 2 after you test if you are not going to use 1.6 backward compatibility option.
-@echo off
-@REM Goto the correct directory
-cd error_api%2\%1
-@REM Copy the executable files
-copy /Y ..\..\error_compat%2\%1\error_compat%2.exe . >tempcopy.out 2>tempcopy.err
-copy /Y ..\..\testfiles\err* . >tempcopy.out 2>tempcopy.err
-@REM use sed to replace the changable number or string(such as line number, thread IDs etc.)
-@REM We also want to combine the standard output and standard error of API tests into one file.
-@REM Note the different NAME between 1.6 and 1.8...
-if "%H5_WANT_H5_V1_6_COMPAT%"=="1" (
-error_compat%2 >actual_test.out 2>actual_test.err
-sed -e "s/thread [0-9]*/thread (IDs)/" -e "s/: .*\.c /: (file name) /" actual_test.err >temp1.err
-sed -e "s/line [0-9]*/line (number)/" -e "s/v[1-9]*\.[0-9]*\./version (number)\./" temp1.err >temp2.err
-sed -e "s/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/" temp2.err >temp3.err
-more /e actual_test.out >actual_temp.err
-more /e temp3.err >>actual_temp.err
-error_api%2 >actual_compat.out 2>actual_compat.err
-) else (
-error_api%2 >actual_test.out 2>actual_test.err
-sed -e "s/thread [0-9]*/thread (IDs)/" -e "s/: .*\.c /: (file name) /" actual_test.err >temp1.err
-sed -e "s/line [0-9]*/line (number)/" -e "s/v[1-9]*\.[0-9]*\./version (number)\./" temp1.err >temp2.err
-sed -e "s/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/" temp2.err >temp3.err
-more /e actual_test.out >actual_temp.err
-more /e temp3.err >>actual_temp.err
-error_compat%2 >actual_compat.out 2>actual_compat.err
-)
-@REM We also want to filter out the first three lines of the expected output in order to 
-@REM get the "no difference output"  between actual and expected results by using fc command.
-if "%H5_WANT_H5_V1_6_COMPAT%"=="1" (
-	more /e +3 error_test_2 >>err_compat_temp
-	more /e +3 err_compat_1 >>expect_temp.err
-) else (
-	more /e +3 error_test_1 >>expect_temp.err
-	more /e +3 err_compat_2 >>err_compat_temp
-)
-
-fc actual_temp.err expect_temp.err > fc_temp.out 2>fc_temp.err
-if %ERRORLEVEL%==0 (
-echo. All error API tests                                                   PASSED
-)else (
-echo. error API tests                                                       FAILED
-)
-fc actual_compat.out err_compat_temp > fc_temp.out 2>fc_temp.err
-if %ERRORLEVEL%==0 (
-echo. All error API compatible tests passed                                 PASSED
-)else (
-echo. error API compatible tests                                            FAILED
-)
-del *.err
-del *.out
-del *temp
-del error_compat%2.exe
-del *.h5
-cd ..\..
-
diff --git a/windows/test/testerror.bat b/windows/test/testerror.bat
new file mode 100644
index 0000000..3dad50b
--- /dev/null
+++ b/windows/test/testerror.bat
@@ -0,0 +1,198 @@
+@echo off
+rem
+rem Copyright by The HDF Group.
+rem Copyright by the Board of Trustees of the University of Illinois.
+rem All rights reserved.
+rem
+rem This file is part of HDF5.  The full HDF5 copyright notice, including
+rem terms governing use, modification, and redistribution, is contained in
+rem the files COPYING and Copyright.html.  COPYING can be found at the root
+rem of the source code distribution tree; Copyright.html can be found at the
+rem root level of an installed copy of the electronic HDF5 document set and
+rem is linked from the top-level documents page.  It can also be found at
+rem http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+rem access to either file, you may request a copy from help@hdfgroup.org.
+rem
+rem Tests for test_error and err_compat 
+rem
+rem    Created:  Scott Wegner, 8/16/07
+rem    Modified: 
+
+setlocal enabledelayedexpansion
+pushd %~dp0
+
+rem Determine backwards compatibility options enabled
+rem set deprecated_symbols=%deprecated_symbols%
+
+set /a nerrors=0
+set verbose=yes
+
+if not exist .\testfiles mkdir testfiles
+
+goto main
+
+rem Print a line-line message left justified in a field of 70 characters
+rem beginning with the word "Testing".
+rem
+:testing
+    set test_msg=Testing
+    for %%a in (%*) do (
+        if %%a neq PASSED (
+        if %%a neq *FAILED* (
+            set test_msg=!test_msg! %%a
+        ) )
+    )
+    set test_msg=%test_msg%                                                                
+    echo.%test_msg:~0,69% %1
+    
+    exit /b
+
+
+rem Run a test and print PASS or *FAIL*.  If a test fails then increment
+rem the `nerrors' global variable and (if $verbose is set) display the
+rem difference between the actual output and the expected output. The
+rem expected output is given as the first argument to this function and
+rem the actual output file is calculated by replacing the `.ddl' with
+rem `.out'.  The actual output is not removed if $HDF5_NOCLEANUP has a
+rem non-zero value.
+rem
+:test
+    rem The test name
+    set test_err=%1%3
+    rem The path of the test binary
+    set test_err_bin=%cd%\%test_err%\%2\%test_err%
+    
+    set expect1=%cd%\testfiles\%~n1_1
+    set expect2=%cd%\testfiles\%~n1_2
+    set expect1_parsed=%~n1_1.parsed
+    set expect2_parsed=%~n1_2.parsed
+    set actual=%~n1.out
+    set actual_err=%~n1.err
+    set actual_ext=%~n1.ext
+    
+    rem Run test
+    (
+        echo.#############################
+        echo.Expected output for %1 
+        echo.#############################
+        %test_err_bin%
+    ) >%actual% 2>%actual_err%
+    rem Extract file name, line number, version and thread IDs because they may 
+    rem be different
+    
+    rem Also filter out lines starting with *****, because Windows treats these
+    rem as wildcards, and parses as filenames.  -SJW, 8/16/07
+    type nul > %actual_ext%
+    for /f "delims=" %%a in (%actual_err%) do (
+        set line_tmp=%%a
+        if not "!line_tmp:~0,9!"=="*********" (
+            set line=
+            set last_token=
+            for %%b in (%%a) do (
+                if "!last_token!"=="thread" (
+                    set line=!line! ^(IDs^):
+                ) else if "!last_token:~0,2!"=="#0" (
+                    set line=!line! ^(file name^)
+                ) else if "!last_token!"=="HDF5" (
+                    rem Check if we wrap parenthesis around "version (number)"
+                    set version_token=%%b
+                    if "!version_token:~0,1!"=="(" (
+                        set line=!line! ^(version ^(number^)^)
+                    ) else (
+                        set line=!line! version ^(number^).
+                    )
+                ) else if "!last_token!"=="line" (
+                    set line=!line! ^(number^)
+                ) else (
+                    set line=!line! %%b
+                )
+                set last_token=%%b
+            )
+            echo.!line!>>%actual_ext%
+        )
+    )
+    type %actual_ext% >> %actual%
+    
+    rem We parse through our expected output file in a similar way, because
+    rem Windows will parse out commas and other special characters as well.
+    rem    -SJW, 8/16/07
+    for %%a in (expect1 expect2) do (
+        type nul > !%%a_parsed!
+        for /f "delims=" %%b in (!%%a!) do (
+            set line_tmp=%%b
+            if not "!line_tmp:~0,9!"=="*********" (
+                set line=
+                for %%c in (%%b) do (
+                    set line=!line! %%c
+                )
+                echo.!line!>>!%%a_parsed!
+            )
+        )
+    )
+    type nul > %expect2_parsed%
+    for /f "delims=" %%a in (%expect2%) do (
+        set line_tmp=%%a
+        if not "!line_tmp:~0,9!"=="*********" (
+            set line=
+            for %%b in (%%a) do (
+                set line=!line! %%b
+            )
+            echo.!line!>>%expect2_parsed%
+        )
+    )
+        
+    fc /w %expect1_parsed% %actual% | find "FC: no diff" > nul
+    if %errorlevel% equ 0 (
+            call :testing PASSED %test_err%
+    ) else (
+        fc /w %expect2_parsed% %actual% | find "FC: no diff" > nul
+        if !errorlevel! equ 0 (
+            call :testing PASSED %test_err%
+        ) else (
+            call :testing *FAILED* %test_err%
+            echo.    Expected result differs from actual result
+            set /a nerrors=%nerrors%+1
+            if "yes"=="%verbose%" fc %expect1_parsed% %actual%
+        )
+    )
+    
+    rem Clean up output file
+    if not defined HDF5_NOCLEANUP (
+        for %%a in (%actual% %actual_err% %actual_ext% %expect1_parsed% %expect2_parsed%) do del /f %%a
+    )
+    
+    exit /b
+    
+    
+rem Print a "SKIP" message
+:skip
+    call :testing -SKIP- %*
+    
+    exit /b
+    
+    
+rem ##############################################################################
+rem ##############################################################################
+rem ###                       T H E   T E S T S                                ###
+rem ##############################################################################
+rem ##############################################################################
+
+:main
+
+    rem test for err_compat
+    if "%deprecated_symbols%"=="yes" (
+        call :skip err_compat %1 %2
+    ) else (
+        call :test err_compat %1 %2
+    )
+
+    rem test for error_test
+    call :test error_test %1 %2
+
+    if %nerrors% equ 0 (
+        echo.All Error API tests passed.
+    )
+    
+    popd
+    endlocal & exit /b %nerrors%
+    
+\ No newline at end of file
author	Scott Wegner <swegner@hdfgroup.org>	2007-09-10 19:14:08 (GMT)
committer	Scott Wegner <swegner@hdfgroup.org>	2007-09-10 19:14:08 (GMT)
commit	43bb1ba8e53c3eb23448baba68485222514ab992 (patch)
tree	e32be74f0faad61cb3c3b29ead9849be5dc59a4d /windows/test
parent	33efca34cb30bcf7e17f6e3aa580233bd58a0075 (diff)
download	hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.zip hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.tar.gz hdf5-43bb1ba8e53c3eb23448baba68485222514ab992.tar.bz2