Correct script grep usage and options

Author: byrnHDF

HDF5Examples/C/H5PAR/CMakeLists.txt

@@ -39,6 +39,7 @@ if (H5EX_BUILD_TESTING)
         -D "TEST_EXPECT=0"
         -D "TEST_SKIP_COMPARE=TRUE"
         -D "TEST_OUTPUT=${testname}.out"
+        -D "TEST_GREP_COMPARE=TRUE"
         -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors"
         -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
         -P "${H5EX_RESOURCES_DIR}/runTest.cmake"

HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt

@@ -50,6 +50,7 @@ if (H5EX_BUILD_TESTING)
         -D "TEST_EXPECT=0"
         -D "TEST_SKIP_COMPARE=TRUE"
         -D "TEST_OUTPUT=${testname}.out"
+        -D "TEST_GREP_COMPARE=TRUE"
         -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors"
         -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
         -P "${H5EX_RESOURCES_DIR}/runTest.cmake"

HDF5Examples/config/cmake/runExecute.cmake

@@ -386,7 +386,7 @@ if (NOT TEST_SKIP_COMPARE)
 endif () # TEST_SKIP_COMPARE
 
 set (TEST_GREP_RESULT 0)
-if (TEST_GREP_COMPARE AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+if (TEST_GREP_COMPARE AND TEST_SKIP_COMPARE AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
   # now grep the output with the reference
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   list (LENGTH TEST_STREAM test_len)

config/cmake/runExecute.cmake

@@ -386,7 +386,7 @@ if (NOT TEST_SKIP_COMPARE)
 endif () # TEST_SKIP_COMPARE
 
 set (TEST_GREP_RESULT 0)
-if (TEST_GREP_COMPARE AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
+if (TEST_GREP_COMPARE AND TEST_SKIP_COMPARE AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
   # now grep the output with the reference
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   list (LENGTH TEST_STREAM test_len)

tools/test/h5dump/CMakeTests.cmake

@@ -851,7 +851,6 @@
               -D "TEST_ERRREF=${result_errcheck}"
               -D "TEST_ENV_VAR:STRING=${envvar}"
               -D "TEST_ENV_VALUE:STRING=${envval}"
-              -D "TEST_GREP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_DIR}/runTest.cmake"
       )
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES

tools/test/h5dump/CMakeTestsPBITS.cmake

@@ -116,7 +116,6 @@
                 -D "TEST_EXPECT=${resultcode}"
                 -D "TEST_REFERENCE=${resultfile}.ddl"
                 -D "TEST_ERRREF=${result_errcheck}"
-                -D "TEST_GREP_COMPARE=TRUE"
                 -P "${HDF_RESOURCES_DIR}/runTest.cmake"
         )
       else ()

tools/test/h5repack/CMakeTests.cmake

@@ -803,6 +803,7 @@
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                   -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
                   -D "TEST_EXPECT=${resultcode}"
+                  -D "TEST_SKIP_COMPARE=TRUE"
                   -D "TEST_GREP_FILTER:STRING=${testfilter}"
                   -D "TEST_REFERENCE=${testfilter}"
                   -D "TEST_GREP_COMPARE=TRUE"
@@ -830,6 +831,7 @@
                   -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                   -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
                   -D "TEST_EXPECT=0"
+                  -D "TEST_SKIP_COMPARE=TRUE"
                   -D "TEST_GREP_EXPECT=${resultcode}"
                   -D "TEST_GREP_FILTER:STRING=${nottestfilter}"
                   -D "TEST_REFERENCE=${testfilter}"
@@ -937,6 +939,7 @@
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
               -D "TEST_EXPECT=0"
+              -D "TEST_SKIP_COMPARE=TRUE"
               -D "TEST_GREP_FILTER:STRING=SUPERBLOCK_VERSION ${superblock}"
               -D "TEST_REFERENCE=SUPERBLOCK_VERSION ${superblock}"
               -D "TEST_GREP_COMPARE=TRUE"
@@ -1008,6 +1011,7 @@
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
               -D "TEST_EXPECT=0"
+              -D "TEST_SKIP_COMPARE=TRUE"
               -D "TEST_GREP_FILTER:STRING=USERBLOCK_SIZE ${userblocksize}"
               -D "TEST_REFERENCE=USERBLOCK_SIZE ${userblocksize}"
               -D "TEST_GREP_COMPARE=TRUE"