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/c++ | |
| 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/c++')
| -rw-r--r-- | windows/c++/test/checkcpptests.bat | 20 | ||||
| -rw-r--r-- | windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj | 4 | ||||
| -rw-r--r-- | windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj | 4 |
3 files changed, 24 insertions, 4 deletions
diff --git a/windows/c++/test/checkcpptests.bat b/windows/c++/test/checkcpptests.bat index e092c04..93ccd2b 100644 --- a/windows/c++/test/checkcpptests.bat +++ b/windows/c++/test/checkcpptests.bat @@ -22,6 +22,8 @@ rem setlocal enabledelayedexpansion
pushd %~dp0
+set /a nerrors=0
+
rem Clean any variables starting with "HDF5_CPPTEST_", as we use these for our
rem tests. Also clear "HDF5_CPPTEST_TESTS", as we will be addding all of our tests
rem to this variable.
@@ -61,12 +63,16 @@ rem %2 - "dll" or nothing rem Only add our parameters for batch scripts.
call !hdf5_cpptest_%%a_test:.bat= %1 %2!
rem Exit early if test fails.
- if !errorlevel! neq 0 exit /b
+ if errorlevel 1 (
+ set /a nerrors=!nerrors!+1
+ echo.
+ echo.************************************
+ echo. Testing %%a ^(%1 %2^) FAILED
+ exit /b 1
+ )
)
rem If we get here, that means all of our tests passed.
- echo.All C++ library tests passed.
-
exit /b
@@ -83,6 +89,12 @@ rem on it for sending parameters. --SJW 9/6/07 rem Run the tests, passing in which version to run
call :run_tests %*
+ if "%nerrors%"=="0" (
+ echo.All C++ library tests passed.
+ ) else (
+ echo.** FAILED C++ Library tests.
+ )
+
popd
- endlocal & exit /b
+ endlocal & exit /b %nerrors%
\ No newline at end of file diff --git a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj index c795d28..0d872af 100644 --- a/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj +++ b/windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj @@ -428,6 +428,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\c++\test\tlinks.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\c++\test\trefer.cpp"
>
</File>
diff --git a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj index b169201..4ceef84 100644 --- a/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj +++ b/windows/c++/test/testhdf5_cppdll/testhdf5_cppdll.vcproj @@ -428,6 +428,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\c++\test\tlinks.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\c++\test\trefer.cpp"
>
</File>
|