diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-21 22:46:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-21 22:46:38 (GMT) |
| commit | 5bb857476f99118cda0e54ea522f52933a582747 (patch) | |
| tree | 741024b69250fe9166091aa8f28bc78c35d3fb64 /windows/tools | |
| parent | 35bbc743d4cf77d6aa8af2acf5578db02e5129ca (diff) | |
| download | hdf5-5bb857476f99118cda0e54ea522f52933a582747.zip hdf5-5bb857476f99118cda0e54ea522f52933a582747.tar.gz hdf5-5bb857476f99118cda0e54ea522f52933a582747.tar.bz2 | |
[svn-r16825] Description:
Bring revisions 16636:16821 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty)
Mac OS X/32 10.5.6 (amazon)
(h5committest not needed on this branch)
Diffstat (limited to 'windows/tools')
| -rw-r--r-- | windows/tools/h5repack/h5repack.bat | 14 | ||||
| -rw-r--r-- | windows/tools/testfiles/h5difftst/h5difftst.vcproj | 12 |
2 files changed, 20 insertions, 6 deletions
diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index a2cc9a3..27c1c12 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -63,6 +63,7 @@ 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 file15=h5repack_named_dtypes.h5
set nerrors=0
@@ -548,8 +549,10 @@ rem call :tooltest %arg9%
rem Native option
- set arg=%file1% -n
- call :tooltest %arg%
+ rem Do not use FILE1, as the named dtype will be converted to native, and h5diff will
+ rem report a difference.
+ call :tooltest %file0% -n
+ call :tooltest %file2% -n
rem latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)
@@ -600,6 +603,13 @@ rem rem to new version and be readable, etc.)
call :tooltest %file14%
+ rem test for datum size > H5TOOLS_MALLOCSIZE
+ set arg=%file1% -f GZIP=1
+ call :tooltest %arg%
+
+ rem Check repacking file with committed datatypes in odd configurations
+ call :tooltest %file15%
+
if %nerrors% equ 0 (
echo.All %h5repack% tests passed.
diff --git a/windows/tools/testfiles/h5difftst/h5difftst.vcproj b/windows/tools/testfiles/h5difftst/h5difftst.vcproj index 98de07a..61f46cd 100644 --- a/windows/tools/testfiles/h5difftst/h5difftst.vcproj +++ b/windows/tools/testfiles/h5difftst/h5difftst.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -141,7 +141,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -232,7 +232,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -325,7 +325,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -450,6 +450,10 @@ RelativePath="..\..\..\..\tools\h5diff\testh5diff.h"
>
</File>
+ <File
+ RelativePath="..\..\..\..\tools\lib\h5tools.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
|