diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:11:49 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:11:49 (GMT) |
| commit | c3663d13d5becf8b3eaed18679f2349bd6ab971a (patch) | |
| tree | 342f53c024764475c96e156c86ea515aa80f8bf0 /config/cmake_ext_mod/grepTest.cmake | |
| parent | 281c24a5a91b16eaf498e5dd5af783773c228758 (diff) | |
| parent | 56e5b4ed05fb3bad51c226ec5b567871a45e0bce (diff) | |
| download | hdf5-c3663d13d5becf8b3eaed18679f2349bd6ab971a.zip hdf5-c3663d13d5becf8b3eaed18679f2349bd6ab971a.tar.gz hdf5-c3663d13d5becf8b3eaed18679f2349bd6ab971a.tar.bz2 | |
Merge pull request #2 in ~JHENDERSON/hdf5 from HDFFV/hdf5:develop to feature/parallel_filters
* commit '56e5b4ed05fb3bad51c226ec5b567871a45e0bce': (112 commits)
updated AM_SILENT_RULES syntax
Added a check for AM_SILENT_RULES before enabling it.
Fix alignment
Fix vds tests
Correct result code for strings test
Add extension to filename
HDFFV-10128 fix string compare and add tests
Description: Only format changes: mostly tabs vs. spaces Platforms tested: Linux/64 (jelly) - very minor
Lowercase math and set CMake commands
Added "flush" and "refresh" to testflushrefresh.sh error output so it's easier to see where errors in the script occur.
Misc. small cleanups to sync against incoming page buffering changes.
Update CMake formatting
Update CMake files and formatting
Normalize against incoming page buffering changes.
HDFFV-10120 verify nozlib checking with tools tests
cmake non-code typo
Correct issues from pull request reviews.
Corrected version of 4b5e05c084f93c35dae946c2c9e814d565a613b0: Fix some more signed -> unsigned value issues with cache data structures, also misc. style cleanups. All to align w/incoming page_buffering changes.
Revert "Fix some more signed -> unsigned value issues with cache data structures, also"
Added virtual to list
...
Diffstat (limited to 'config/cmake_ext_mod/grepTest.cmake')
| -rw-r--r-- | config/cmake_ext_mod/grepTest.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake index a090057..31c8421 100644 --- a/config/cmake_ext_mod/grepTest.cmake +++ b/config/cmake_ext_mod/grepTest.cmake @@ -4,25 +4,25 @@ # arguments checking if (NOT TEST_PROGRAM) message (FATAL_ERROR "Require TEST_PROGRAM to be defined") -endif (NOT TEST_PROGRAM) +endif () #if (NOT TEST_ARGS) # message (STATUS "Require TEST_ARGS to be defined") -#endif (NOT TEST_ARGS) +#endif () if (NOT TEST_FOLDER) message ( FATAL_ERROR "Require TEST_FOLDER to be defined") -endif (NOT TEST_FOLDER) +endif () if (NOT TEST_OUTPUT) message (FATAL_ERROR "Require TEST_OUTPUT to be defined") -endif (NOT TEST_OUTPUT) +endif () #if (NOT TEST_EXPECT) # message (STATUS "Require TEST_EXPECT to be defined") -#endif (NOT TEST_EXPECT) +#endif () if (NOT TEST_FILTER) message (STATUS "Require TEST_FILTER to be defined") -endif (NOT TEST_FILTER) +endif () if (NOT TEST_REFERENCE) message (FATAL_ERROR "Require TEST_REFERENCE to be defined") -endif (NOT TEST_REFERENCE) +endif () message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}") @@ -48,7 +48,7 @@ string (REGEX MATCH "${TEST_REFERENCE}" TEST_MATCH ${TEST_STREAM}) string (COMPARE EQUAL "${TEST_REFERENCE}" "${TEST_MATCH}" TEST_RESULT) if (${TEST_RESULT} STREQUAL "0") message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not contain ${TEST_REFERENCE}") -endif (${TEST_RESULT} STREQUAL "0") +endif () string (REGEX MATCH "${TEST_FILTER}" TEST_MATCH ${TEST_STREAM}) if (${TEST_EXPECT} STREQUAL "1") @@ -56,8 +56,8 @@ if (${TEST_EXPECT} STREQUAL "1") string (LENGTH "${TEST_MATCH}" TEST_RESULT) if (NOT ${TEST_RESULT} STREQUAL "0") message (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}") - endif (NOT ${TEST_RESULT} STREQUAL "0") -endif (${TEST_EXPECT} STREQUAL "1") + endif () +endif () # everything went fine... message ("Passed: The output of ${TEST_PROGRAM} matched") |