[svn-r20330] Adjust H5JAM tests for valgind execution

2 files changed, 46 insertions, 14 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 2a3159b..a9e4f17 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -75,6 +75,9 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5JAM-SETUP-N_twithub513_u512_c-clear-objects
     H5JAM-N_twithub513_u512_c-clear-objects
     H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u513_c-clear-objects
+    H5JAM-N_twithub513_u513_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
     H5JAM-CHECKFILE-twithub_u10_c-clear-objects
     H5JAM-twithub_u511_c-clear-objects
     H5JAM-CHECKFILE-twithub_u511_c-clear-objects
@@ -93,11 +96,29 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5JAM-SETUP-N_twithub_u10_c-clear-objects
     H5JAM-N_twithub_u10_c-clear-objects
     H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
+    H5JAM-SETUP-twithub_tall-clear-objects
+    H5JAM-UNJAM-twithub_tall-clear-objects
+    H5JAM-UNJAM_D-twithub_tall-clear-objects
+    H5JAM-CHECKFILE-twithub_tall-clear-objects
+    H5JAM-SETUP-twithub513_tall-clear-objects
+    H5JAM-UNJAM-twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-twithub513_tall-clear-objects
+    H5JAM-SETUP-N_twithub_tall-clear-objects
+    H5JAM-UNJAM-N_twithub_tall-clear-objects
+    H5JAM-UNJAM_D-N_twithub_tall-clear-objects
+    H5JAM-CHECKFILE-N_twithub_tall-clear-objects
+    H5JAM-SETUP-N_twithub513_tall-clear-objects
+    H5JAM-UNJAM-N_twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
     H5JAM-SETUP-D_twithub_tall-clear-objects
     H5JAM-UNJAM-D_twithub_tall-clear-objects
+    H5JAM-UNJAM_D-D_twithub_tall-clear-objects
     H5JAM-CHECKFILE-D_twithub_tall-clear-objects
     H5JAM-SETUP-D_twithub513_tall-clear-objects
     H5JAM-UNJAM-D_twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
     H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
     H5JAM-CHECKFILE-ta_u513-clear-objects
     H5JAM-twithub_u10-clear-objects
@@ -140,7 +161,7 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5LS-clearall-objects
     ######### tools/h5repack #########
     H5REPACK-clearall-objects
-    H5REPACK-gzip_verbose_filters                 #uses runTest.cmake
+    H5REPACK-gzip_verbose_filters                       #uses runTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_chunk_20x10            #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT_ALL-chunk_20x10              #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_conti                  #uses grepTest.cmake
@@ -166,8 +187,8 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     h5repart_20K-clear-objects
     h5repart_5K-clear-objects
     h5repart_sec2-clear-objects
-    H5MKGRP-h5mkgrp_help                                #uses runTest.cmake
-    H5MKGRP-h5mkgrp_version                             #uses runTest.cmake
+    H5MKGRP-clear-h5mkgrp_help
+    H5MKGRP-clear-h5mkgrp_version
     H5MKGRP-clear-h5mkgrp_single
     H5MKGRP-h5mkgrp_single                              #uses runTest.cmake
     H5MKGRP-H5LS-h5mkgrp_single                         #uses runTest.cmake
@@ -204,4 +225,7 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5MKGRP-clear-h5mkgrp_nested_mult_latest-lp
     H5MKGRP-h5mkgrp_nested_mult_latest-lp               #uses runTest.cmake
     H5MKGRP-H5LS-h5mkgrp_nested_mult_latest-lp          #uses runTest.cmake
+    ######### examples #########
+    EXAMPLES-clear-objects
+    cpp_ex-clear-objects
 )
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 475f159..72abc8a 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -165,6 +165,7 @@ IF (BUILD_TESTING)
   ENDMACRO(SETUP testname infile outfile)
 
   MACRO (CHECK_UB_1 testname testfile ufile)
+    IF (NOT HDF5_ENABLE_USING_MEMCHECKER) #Temporary
     ADD_TEST (
         NAME H5JAM-CHECK_UB_1-${testname}
         COMMAND ${CMAKE_COMMAND} -E echo "CHECK_UB_1 ${testname} ${testfile} ${ufile} ${ARGN}"
@@ -173,9 +174,11 @@ IF (BUILD_TESTING)
       SET_TESTS_PROPERTIES (H5JAM-CHECK_UB_1-${testname} PROPERTIES DEPENDS ${last_test})
     ENDIF (NOT "${last_test}" STREQUAL "")
     SET (last_test "H5JAM-CHECK_UB_1-${testname}")
+    ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) #Temporary
   ENDMACRO(CHECK_UB_1 testname testfile ufile)
 
   MACRO (CHECK_NOUB testname testfile)
+    IF (NOT HDF5_ENABLE_USING_MEMCHECKER) #Temporary
     ADD_TEST (
         NAME H5JAM-CHECK_NOUB-${testname}
         COMMAND ${CMAKE_COMMAND} -E echo "CHECK_NOUB ${testname} ${testfile} ${ARGN}"
@@ -184,6 +187,7 @@ IF (BUILD_TESTING)
       SET_TESTS_PROPERTIES (H5JAM-CHECK_NOUB-${testname} PROPERTIES DEPENDS ${last_test})
     ENDIF (NOT "${last_test}" STREQUAL "")
     SET (last_test "H5JAM-CHECK_NOUB-${testname}")
+    ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) #Temporary
   ENDMACRO(CHECK_NOUB testname testfile)
 
   MACRO (UNJAMTEST testname infile ufile outfile)
@@ -210,17 +214,21 @@ IF (BUILD_TESTING)
             COMMAND ${CMAKE_COMMAND} -E remove ${outfile}.ufile.txt ${outfile}.ufile.txt.err
         )
         SET_TESTS_PROPERTIES (H5JAM-UNJAM_D-${testname}-clear-objects PROPERTIES DEPENDS H5JAM-UNJAM-${testname}-clear-objects)
-        ADD_TEST (
-            NAME H5JAM-UNJAM-${testname}
-            COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5unjam>"
-                -D "TEST_ARGS:STRING=-i;${infile};-o;${outfile}"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-                -D "TEST_OUTPUT=${outfile}.ufile.txt"
-                -D "TEST_EXPECT=0"
-                -D "TEST_SKIP_COMPARE=TRUE"
-                -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
-        )
+        IF (HDF5_ENABLE_USING_MEMCHECKER)
+          ADD_TEST (NAME H5JAM-UNJAM-${testname} COMMAND <TARGET_FILE:h5unjam> -i ${infile} -o ${outfile})
+        ELSE (HDF5_ENABLE_USING_MEMCHECKER)
+          ADD_TEST (
+              NAME H5JAM-UNJAM-${testname}
+              COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5unjam>"
+                  -D "TEST_ARGS:STRING=-i;${infile};-o;${outfile}"
+                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                  -D "TEST_OUTPUT=${outfile}.ufile.txt"
+                  -D "TEST_EXPECT=0"
+                  -D "TEST_SKIP_COMPARE=TRUE"
+                  -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
+          )
+        ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
         SET_TESTS_PROPERTIES (H5JAM-UNJAM-${testname} PROPERTIES DEPENDS H5JAM-UNJAM_D-${testname}-clear-objects)
         SET (compare_test "${outfile}.ufile.txt")
       ELSE (NOT "${ARGN}" STREQUAL "--delete")