diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-22 17:49:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-09-22 17:49:17 (GMT) |
| commit | f75166dd98bf326440e7a1b503cb6df2edec1263 (patch) | |
| tree | 96bfdb5d4044c80ed0d792c0db9310f710060a58 /windows/tools | |
| parent | 859507f75757b890bf21dee43476a94bff526cb9 (diff) | |
| download | hdf5-f75166dd98bf326440e7a1b503cb6df2edec1263.zip hdf5-f75166dd98bf326440e7a1b503cb6df2edec1263.tar.gz hdf5-f75166dd98bf326440e7a1b503cb6df2edec1263.tar.bz2 | |
[svn-r17505] Description:
Bring r17416:17496 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'windows/tools')
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 10 | ||||
| -rw-r--r-- | windows/tools/h5dump/testh5dump.bat | 8 | ||||
| -rw-r--r-- | windows/tools/talign/talign.vcproj | 10 | ||||
| -rw-r--r-- | windows/tools/taligndll/taligndll.vcproj | 10 |
4 files changed, 18 insertions, 20 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index af1e7d4..4b5f265 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -381,8 +381,8 @@ rem ############################################################################ call :tooltest h5diff_607.txt -d "1" %file1% %file2% g1/dset3 g1/dset4
rem 6.8: repeated option
- call :testing %h5diff% -d 1 -d 2 %srcfile1% %srcfile2% g1/dset3 g1/dset4
- call :tooltest h5diff_608.txt -d 1 -d 2 %file1% %file2% g1/dset3 g1/dset4
+ call :testing %h5diff% --use-system-epsilon %srcfile1% %srcfile2% g1/dset3 g1/dset4
+ call :tooltest h5diff_608.txt --use-system-epsilon %file1% %file2% g1/dset3 g1/dset4
rem 6.9: number larger than biggest difference
call :testing %h5diff% -d 200 %srcfile1% %srcfile2% g1/dset3 g1/dset4
@@ -432,13 +432,10 @@ rem ############################################################################ call :tooltest h5diff_619.txt -p 0.005 %file1% %file2% g1/dset3 g1/dset4
-
rem ##############################################################################
rem # -n
rem ##############################################################################
-
-
rem 6.21: negative value
call :testing %h5diff% -n -4 %srcfile1% %srcfile2% g1/dset3 g1/dset4
call :tooltest h5diff_621.txt -n -4 %file1% %file2% g1/dset3 g1/dset4
@@ -471,6 +468,7 @@ rem ############################################################################ call :testing %h5diff% -n 1 %srcfile1% %srcfile2% g1/dset3 g1/dset4
call :tooltest h5diff_628.txt -n 1 %file1% %file2% g1/dset3 g1/dset4
+ rem This is disabled on *nix platforms
rem 6.29 non valid files
call :testing %h5diff% file1.h6 file2.h6
call :tooltest h5diff_629.txt file1.h6 file2.h6
@@ -493,7 +491,7 @@ rem ############################################################################ rem 10. read by hyperslab, print indexes
rem ##############################################################################
- rem Not tested on windows as this has not been a problem - ADB 1/22/2009
+ rem Not skipped on windows as this has not been a problem - ADB 1/22/2009
rem if test -n "$pmode" -a "$mydomainname" = hdfgroup.uiuc.edu; then
rem # skip this test which sometimes hangs in some THG machines
rem SKIP -v $SRCFILE9 $SRCFILE10
diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat index afad801..e776c07 100644 --- a/windows/tools/h5dump/testh5dump.bat +++ b/windows/tools/h5dump/testh5dump.bat @@ -377,6 +377,7 @@ rem ############################################################################ call :tooltest tarray5.ddl tarray5.h5
call :tooltest tarray6.ddl tarray6.h5
call :tooltest tarray7.ddl tarray7.h5
+ call :tooltest tarray8.ddl tarray8.h5
rem test for files with empty data
call :tooltest tempty.ddl tempty.h5
@@ -580,6 +581,9 @@ rem ############################################################################ rem test for dataset region references
call :tooltest tdatareg.ddl tdatareg.h5
+ call :tooltest tdataregR.ddl -R tdatareg.h5
+ call :tooltest tattrreg.ddl tattrreg.h5
+ call :tooltest tattrregR.ddl -R tattrreg.h5
rem tests for group creation order
rem "1" tracked, "2" name, root tracked
@@ -603,10 +607,6 @@ rem ############################################################################ rem tests for traversal of external links call :tooltest textlinksrc.ddl textlinksrc.h5 call :tooltest textlinkfar.ddl textlinkfar.h5 -
- rem tests for traversal of external links
- call :tooltest textlinksrc.ddl textlinksrc.h5
- call :tooltest textlinkfar.ddl textlinkfar.h5
diff --git a/windows/tools/talign/talign.vcproj b/windows/tools/talign/talign.vcproj index 6ee5c64..eb59c88 100644 --- a/windows/tools/talign/talign.vcproj +++ b/windows/tools/talign/talign.vcproj @@ -47,7 +47,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -140,7 +140,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -233,7 +233,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -326,7 +326,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -392,7 +392,7 @@ </References>
<Files>
<File
- RelativePath="..\..\..\tools\lib\talign.c"
+ RelativePath="..\..\..\tools\misc\talign.c"
>
</File>
</Files>
diff --git a/windows/tools/taligndll/taligndll.vcproj b/windows/tools/taligndll/taligndll.vcproj index 8c1ecce..61ec1a2 100644 --- a/windows/tools/taligndll/taligndll.vcproj +++ b/windows/tools/taligndll/taligndll.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
@@ -140,7 +140,7 @@ Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
@@ -230,7 +230,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -322,7 +322,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\tools\lib,..\..\..\src"
+ AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -388,7 +388,7 @@ </References>
<Files>
<File
- RelativePath="..\..\..\tools\lib\talign.c"
+ RelativePath="..\..\..\tools\misc\talign.c"
>
</File>
</Files>
|