diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-05 23:19:01 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-05 23:19:01 (GMT) |
commit | 0de252524dfec1028bdd9241dbd4cca46535b93a (patch) | |
tree | cb9df4f6d8db74ee263e82459e562037c26de611 /config/cmake/runTest.cmake | |
parent | 1fe94ec545b2ae92fefc16eb3d9864e52b12107d (diff) | |
download | hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.zip hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.tar.gz hdf5-0de252524dfec1028bdd9241dbd4cca46535b93a.tar.bz2 |
[svn-r19179] Description:
Bring changes from Coverity branch back to trunk:
r19079 & 19080:
[BZ1942] h5dump -u to generate XML, it does not respect the -m option
xml version of dump_data function didn't check for use of fp_format variable.
Added new test expected file for committed bug 1942
r19103, 19104 & 19105:
[BZ1821] h5repack -v did not display correct output for a selected compression. Needed new test for comparing output of -v option.
Added new test file for solution to BZ1821
BZ1821 - Bring test changes from the shell script actually used.
Tested on:
Mac OS X/32 10.6.4 (amazon) debug & production
(h5committested on branch)
Diffstat (limited to 'config/cmake/runTest.cmake')
-rw-r--r-- | config/cmake/runTest.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index 4218671..227ef9b 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -17,6 +17,9 @@ ENDIF (NOT TEST_OUTPUT) #IF (NOT TEST_EXPECT) # MESSAGE (STATUS "Require TEST_EXPECT to be defined") #ENDIF (NOT TEST_EXPECT) +#IF (NOT TEST_FILTER) +# MESSAGE (STATUS "Require TEST_FILTER to be defined") +#ENDIF (NOT TEST_FILTER) IF (NOT TEST_REFERENCE) MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined") ENDIF (NOT TEST_REFERENCE) @@ -61,6 +64,12 @@ IF (TEST_MASK) FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") ENDIF (TEST_MASK) +IF (TEST_FILTER) + FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) + STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") + FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") +ENDIF (TEST_FILTER) + IF (WIN32 AND NOT MINGW) FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") |