diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-16 20:45:05 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-16 20:45:05 (GMT) |
commit | d2b87ec47ebdb096c331c7b62a195b9cea2f33ae (patch) | |
tree | a066f01361afaf5df457cef612bb0bb9fd80fe18 /windows/examples | |
parent | ee5a1e07350f0dcf3ef07d9443aa2f4c073392f4 (diff) | |
download | hdf5-d2b87ec47ebdb096c331c7b62a195b9cea2f33ae.zip hdf5-d2b87ec47ebdb096c331c7b62a195b9cea2f33ae.tar.gz hdf5-d2b87ec47ebdb096c331c7b62a195b9cea2f33ae.tar.bz2 |
[svn-r17896] Description:
Bring r17546:17895 from trunk to revise_chunks branch. Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces. Also, other adjustments to source code
and expected output in response to changes on the trunk.
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/default API=1.8.x,
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.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'windows/examples')
-rw-r--r-- | windows/examples/allexamples/allexamples.vcproj | 8 | ||||
-rwxr-xr-x | windows/examples/testExamples.bat | 112 | ||||
-rwxr-xr-x | windows/examples/testExamples_exp_output.txt | 6 |
3 files changed, 16 insertions, 110 deletions
diff --git a/windows/examples/allexamples/allexamples.vcproj b/windows/examples/allexamples/allexamples.vcproj index 4c87ec0..d426da9 100644 --- a/windows/examples/allexamples/allexamples.vcproj +++ b/windows/examples/allexamples/allexamples.vcproj @@ -21,7 +21,7 @@ Name="Release|Win32"
OutputDirectory="..\..\..\examples\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -109,7 +109,7 @@ Name="Release|x64"
OutputDirectory="..\..\..\examples\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -198,7 +198,7 @@ Name="Debug|Win32"
OutputDirectory="..\..\..\examples\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -286,7 +286,7 @@ Name="Debug|x64"
OutputDirectory="..\..\..\examples\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
diff --git a/windows/examples/testExamples.bat b/windows/examples/testExamples.bat index 57aa19c..e6367ac 100755 --- a/windows/examples/testExamples.bat +++ b/windows/examples/testExamples.bat @@ -19,111 +19,17 @@ REM Last Modified: 10/16/2004 if %1.==. GOTO WRONG
if "%1"=="/?" GOTO HELP
-if %1==release GOTO RELEASE
-if %1==debug GOTO DEBUG
-GOTO WRONG
-:RELEASE
-if %2.==. GOTO REL
-if %2==dll GOTO RELDLL
-GOTO WRONG
-
-:REL
-type nul > %1.txt
-cd examplesREL
-attributetest >> ..\%1.txt
-compoundtest >> ..\%1.txt
-extendwritetest >> ..\%1.txt
-grouptest >> ..\%1.txt
-intermgrouptest >> ..\%1.txt
-selectest >> ..\%1.txt
-writetest >> ..\%1.txt
-chunkread >> ..\%1.txt
-readtest >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
- echo All HDF5 C examples tests passed.
-) else (
- echo HDF5 C examples tests failed.
- echo.
- more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:RELDLL
-type nul > %1.txt
-cd examplesRELDLL
-attributetestdll >> ..\%1.txt
-compoundtestdll >> ..\%1.txt
-extendwritetestdll >> ..\%1.txt
-grouptestdll >> ..\%1.txt
-intermgrouptestdll >> ..\%1.txt
-selectestdll >> ..\%1.txt
-writetestdll >> ..\%1.txt
-chunkreaddll >> ..\%1.txt
-readtestdll >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
- echo All HDF5 C examples tests passed.
-) else (
- echo HDF5 C examples tests failed.
- echo.
- more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:DEBUG
-if %2.==. GOTO DBG
-if %2==dll GOTO DBGDLL
-GOTO WRONG
-
-:DBG
-type nul > %1.txt
-cd examplesDBG
-attributetest >> ..\%1.txt
-compoundtest >> ..\%1.txt
-extendwritetest >> ..\%1.txt
-grouptest >> ..\%1.txt
-intermgrouptest >> ..\%1.txt
-selectest >> ..\%1.txt
-writetest >> ..\%1.txt
-chunkread >> ..\%1.txt
-readtest >> ..\%1.txt
-cd ..
-more /e +3 testExamples_exp_output.txt > output.txt
-fc %1.txt output.txt >temp.txt
-if %ERRORLEVEL%==0 (
- echo All HDF5 C examples tests passed.
-) else (
- echo HDF5 C examples tests failed.
- echo.
- more temp.txt
-)
-del output.txt
-del temp.txt
-GOTO END
-
-:DBGDLL
type nul > %1.txt
-cd examplesDBGDLL
-attributetestdll >> ..\%1.txt
-compoundtestdll >> ..\%1.txt
-extendwritetestdll >> ..\%1.txt
-grouptestdll >> ..\%1.txt
-intermgrouptestdll >> ..\%1.txt
-selectestdll >> ..\%1.txt
-writetestdll >> ..\%1.txt
-chunkreaddll >> ..\%1.txt
-readtestdll >> ..\%1.txt
-cd ..
+attributetest%2\%1\attributetest%2 >> %1.txt
+compoundtest%2\%1\compoundtest%2 >> %1.txt
+extendwritetest%2\%1\extendwritetest%2 >> %1.txt
+grouptest%2\%1\grouptest%2 >> %1.txt
+intermgrouptest%2\%1\intermgrouptest%2 >> %1.txt
+selectest%2\%1\selectest%2 >> %1.txt
+writetest%2\%1\writetest%2 >> %1.txt
+chunkread%2\%1\chunkread%2 >> %1.txt
+readtest%2\%1\readtest%2 >> %1.txt
more /e +3 testExamples_exp_output.txt > output.txt
fc %1.txt output.txt >temp.txt
if %ERRORLEVEL%==0 (
diff --git a/windows/examples/testExamples_exp_output.txt b/windows/examples/testExamples_exp_output.txt index 228c69f..b57688f 100755 --- a/windows/examples/testExamples_exp_output.txt +++ b/windows/examples/testExamples_exp_output.txt @@ -2,7 +2,9 @@ Expected output for HDF5 C examples tests ############################# The value of the attribute "Integer attribute" is 1 -Found string attribute; its index is 1 , value = ABCD +Found string attribute; its index is 2 , value = ABCD + +Name : Character attribute Name : Float attribute Rank : 2 @@ -10,8 +12,6 @@ Dimension sizes : 2 3 Type : FLOAT Values : -1.000000 -1.000000 -1.000000 -1.000000 -1.000000 -1.000000 -Name : Character attribute - Name : Integer attribute Field c : |