[svn-r23286] HDFFV-8311: Correct test dependency

Tested: local linux

18 files changed, 301 insertions, 249 deletions

diff --git a/MANIFEST b/MANIFEST
index e0ffe8f..86527c9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2128,16 +2128,18 @@
 ./tools/h5copy/testfiles/h5copy_misc1.out
 
 # test files for h5mkgrp
-./tools/testfiles/h5mkgrp_help.ls
-./tools/testfiles/h5mkgrp_nested.ls
-./tools/testfiles/h5mkgrp_nested_latest.ls
-./tools/testfiles/h5mkgrp_nested_mult.ls
-./tools/testfiles/h5mkgrp_nested_mult_latest.ls
+./tools/testfiles/h5mkgrp_nested-p.ls
+./tools/testfiles/h5mkgrp_nested_lp.ls
+./tools/testfiles/h5mkgrp_nested_mult-p.ls
+./tools/testfiles/h5mkgrp_nested_mult_lp.ls
 ./tools/testfiles/h5mkgrp_several.ls
-./tools/testfiles/h5mkgrp_several_latest.ls
+./tools/testfiles/h5mkgrp_several-v.ls
+./tools/testfiles/h5mkgrp_several-p.ls
+./tools/testfiles/h5mkgrp_several_l.ls
 ./tools/testfiles/h5mkgrp_single.ls
-./tools/testfiles/h5mkgrp_single_latest.ls
-./tools/testfiles/h5mkgrp_version.ls
+./tools/testfiles/h5mkgrp_single-v.ls
+./tools/testfiles/h5mkgrp_single-p.ls
+./tools/testfiles/h5mkgrp_single_l.ls
 
 
 # high level libraries
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 9d6f276..ec7b10e 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -205,47 +205,8 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     ######### tools/h5stat #########
     H5STAT-clearall-objects
     ######### tools/misc #########
-    h5repart_20K-clear-objects
-    h5repart_5K-clear-objects
-    h5repart_sec2-clear-objects
-    H5MKGRP_CMP-clear-h5mkgrp_help
-    H5MKGRP_CMP-clear-h5mkgrp_version
-    H5MKGRP-clear-h5mkgrp_single
-    H5MKGRP-h5mkgrp_single                              #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single                         #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single-v
-    H5MKGRP-h5mkgrp_single-v                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single-v                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single-p
-    H5MKGRP-h5mkgrp_single-p                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single-p                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single_latest-l
-    H5MKGRP-h5mkgrp_single_latest-l                     #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single_latest-l                #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several
-    H5MKGRP-h5mkgrp_several                             #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several                        #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several-v
-    H5MKGRP-h5mkgrp_several-v                           #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several-v                      #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several-p
-    H5MKGRP-h5mkgrp_several-p                           #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several-p                      #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several_latest-l
-    H5MKGRP-h5mkgrp_several_latest-l                    #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several_latest-l               #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested-p
-    H5MKGRP-h5mkgrp_nested-p                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested-p                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested_latest-lp
-    H5MKGRP-h5mkgrp_nested_latest-lp                    #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested_latest-lp               #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested_mult-p
-    H5MKGRP-h5mkgrp_nested_mult-p                       #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested_mult-p                  #uses runTest.cmake
-    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
+    H5REPART-clearall-objects
+    H5MKGRP-clearall-objects
     ######### examples #########
     EXAMPLES-clear-objects
     cpp_ex-clear-objects
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index d310d3d..3106a3a 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -62,7 +62,7 @@ IF (BUILD_TESTING)
   SET_TARGET_PROPERTIES (h5repart_test PROPERTIES FOLDER tools)
   
   # --------------------------------------------------------------------
-  # Copy all the HDF5 files from the test directory into the source directory
+  # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
   SET (HDF5_REFERENCE_TEST_FILES
       family_file00000.h5
@@ -97,37 +97,43 @@ IF (BUILD_TESTING)
   ENDFOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES})
   
   SET (HDF5_MKGRP_TEST_FILES
-      #h5mkgrp_help
+      #h5mkgrp_help.txt
       #h5mkgrp_version
-      h5mkgrp_single
-      h5mkgrp_single_latest
-      h5mkgrp_several
-      h5mkgrp_several_latest
-      h5mkgrp_nested
-      h5mkgrp_nested_latest
-      h5mkgrp_nested_mult
-      h5mkgrp_nested_mult_latest
+      h5mkgrp_single.ls
+      h5mkgrp_single_v.ls
+      h5mkgrp_single_p.ls
+      h5mkgrp_single_l.ls
+      h5mkgrp_several.ls
+      h5mkgrp_several_v.ls
+      h5mkgrp_several_p.ls
+      h5mkgrp_several_l.ls
+      h5mkgrp_nested_p.ls
+      h5mkgrp_nested_lp.ls
+      h5mkgrp_nested_mult_p.ls
+      h5mkgrp_nested_mult_lp.ls
   )
 
-  FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/../testfiles")
+  # make test dir
+  FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+
   FOREACH (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES})
-    SET (dest "${PROJECT_BINARY_DIR}/${h5_mkgrp_file}")
+    SET (dest "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}")
     #MESSAGE (STATUS " Copying ${h5_mkgrp_file}")
     ADD_CUSTOM_COMMAND (
         TARGET     h5mkgrp
         POST_BUILD
-        COMMAND    ${XLATE_UTILITY}
-        ARGS       ${HDF5_TOOLS_SRC_DIR}/testfiles/${h5_mkgrp_file}.ls ${dest}.ls -l3
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${h5_mkgrp_file} ${dest}
     )
   ENDFOREACH (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES})
 
   ADD_CUSTOM_COMMAND (
       TARGET     h5mkgrp
       POST_BUILD
-      COMMAND    ${XLATE_UTILITY}
-      ARGS       ${PROJECT_SOURCE_DIR}/testfiles/h5mkgrp_help.txt ${PROJECT_BINARY_DIR}/h5mkgrp_help.txt -l0
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/h5mkgrp_help.txt ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt
   )
-  CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/h5mkgrp_version.txt @ONLY)
+  CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_version.txt @ONLY)
 
 ##############################################################################
 ##############################################################################
@@ -136,102 +142,71 @@ IF (BUILD_TESTING)
 ##############################################################################
 
   MACRO (ADD_H5_TEST resultfile resultcode resultoption)
-    IF (NOT ${resultoption} STREQUAL " ")
-      ADD_TEST (
-          NAME H5MKGRP-clear-${resultfile}${resultoption}
-          COMMAND    ${CMAKE_COMMAND}
-              -E remove 
-                  ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 
-                  ${PROJECT_BINARY_DIR}/${resultfile}.out
-                  ${PROJECT_BINARY_DIR}/${resultfile}.out.err
-      )
-      IF (NOT "${last_test}" STREQUAL "")
-        SET_TESTS_PROPERTIES (H5MKGRP-clear-${resultfile}${resultoption} PROPERTIES DEPENDS ${last_test})
-      ENDIF (NOT "${last_test}" STREQUAL "")
-      ADD_TEST (
-          NAME H5MKGRP-${resultfile}${resultoption}
-          COMMAND $<TARGET_FILE:h5mkgrp> ${resultoption} ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN}
-      )
-      SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption})
-      SET (last_test "H5MKGRP-${resultfile}${resultoption}")
-      IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
-        ADD_TEST (
-            NAME H5MKGRP-h5ls-${resultfile}${resultoption}
-            COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
-                -D "TEST_ARGS:STRING=-v;-r;../testfiles/${resultfile}.h5"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-                -D "TEST_OUTPUT=${resultfile}.out"
-                -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_MASK_MOD=true"
-                -D "TEST_REFERENCE=${resultfile}.ls"
-                -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
-        )
-        SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption})
-        SET (last_test "H5MKGRP-h5ls-${resultfile}${resultoption}")
-      ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    ELSE (NOT ${resultoption} STREQUAL " ")
+    IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (
-          NAME H5MKGRP-clear-${resultfile}
+          NAME H5MKGRP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove 
-                  ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 
-                  ${PROJECT_BINARY_DIR}/${resultfile}.out
-                  ${PROJECT_BINARY_DIR}/${resultfile}.out.err
+                  ${resultfile}.h5 
+                  ${resultfile}.out
+                  ${resultfile}.out.err
       )
+      SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+    ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      
+    ADD_TEST (
+        NAME H5MKGRP-${resultfile}
+        COMMAND $<TARGET_FILE:h5mkgrp> ${resultoption} ${resultfile}.h5 ${ARGN}
+    )
+    SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+    IF (HDF5_ENABLE_USING_MEMCHECKER)
       IF (NOT "${last_test}" STREQUAL "")
-        SET_TESTS_PROPERTIES (H5MKGRP-clear-${resultfile} PROPERTIES DEPENDS ${last_test})
+        SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES DEPENDS ${last_test})
       ENDIF (NOT "${last_test}" STREQUAL "")
+    ELSE (HDF5_ENABLE_USING_MEMCHECKER)
+      SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}-clear-objects)
       ADD_TEST (
-          NAME H5MKGRP-${resultfile}
-          COMMAND $<TARGET_FILE:h5mkgrp> ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN}
+          NAME H5MKGRP-${resultfile}-h5ls
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
+              -D "TEST_ARGS:STRING=-v;-r;${resultfile}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${resultfile}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_MASK_MOD=true"
+              -D "TEST_REFERENCE=${resultfile}.ls"
+              -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
       )
-      SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile})
-      SET (last_test "H5MKGRP-${resultfile}")
-      IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
-        ADD_TEST (
-            NAME H5MKGRP-h5ls-${resultfile}
-            COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
-                -D "TEST_ARGS:STRING=-v;-r;../testfiles/${resultfile}.h5"
-                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-                -D "TEST_OUTPUT=${resultfile}.out"
-                -D "TEST_EXPECT=${resultcode}"
-                -D "TEST_MASK_MOD=true"
-                -D "TEST_REFERENCE=${resultfile}.ls"
-                -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
-        )
-        SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile})
-        SET (last_test "H5MKGRP-h5ls-${resultfile}")
-      ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
-    ENDIF (NOT ${resultoption} STREQUAL " ")
+      SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}-h5ls PROPERTIES DEPENDS H5MKGRP-${resultfile})
+    ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
   ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption)
 
   MACRO (ADD_H5_CMP resultfile resultcode)
-    ADD_TEST (
-        NAME H5MKGRP_CMP-clear-${resultfile}
-        COMMAND    ${CMAKE_COMMAND}
-            -E remove 
-                ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 
-                ${PROJECT_BINARY_DIR}/${resultfile}.out
-                ${PROJECT_BINARY_DIR}/${resultfile}.out.err
-    )
     IF (HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (NAME H5MKGRP_CMP-${resultfile} COMMAND $<TARGET_FILE:h5mkgrp> ${ARGN})
     ELSE (HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (
+          NAME H5MKGRP_CMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove 
+                  ${resultfile}.h5 
+                  ${resultfile}.out
+                  ${resultfile}.out.err
+      )
+      SET_TESTS_PROPERTIES (H5MKGRP_CMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      ADD_TEST (
           NAME H5MKGRP_CMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5mkgrp>"
               -D "TEST_ARGS:STRING=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${resultfile}.out"
               -D "TEST_EXPECT=${resultcode}"
               -D "TEST_REFERENCE=${resultfile}.txt"
               -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
       )
+      SET_TESTS_PROPERTIES (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-${resultfile}-clear-objects)
     ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
-    SET_TESTS_PROPERTIES (H5MKGRP_CMP-${resultfile} PROPERTIES DEPENDS H5MKGRP_CMP-clear-${resultfile})
   ENDMACRO (ADD_H5_CMP resultfile resultcode)
 
 ##############################################################################
@@ -242,71 +217,115 @@ IF (BUILD_TESTING)
 
   # Remove any output file left over from previous test run
   ADD_TEST (
-      NAME h5repart_20K-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          fst_family00000.h5
+    NAME H5REPART-clearall-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove 
+        fst_family00000.h5
+        scd_family00000.h5
+        scd_family00001.h5
+        scd_family00002.h5
+        scd_family00003.h5
+        family_to_sec2.h5
   )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (H5REPART-clearall-objects PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "H5REPART-clearall-objects")
+  
   # repartition family member size to 20,000 bytes.
-  ADD_TEST (NAME h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5)
-  SET_TESTS_PROPERTIES (h5repart_20K PROPERTIES DEPENDS h5repart_20K-clear-objects)
+  ADD_TEST (NAME H5REPART-h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5)
+  SET_TESTS_PROPERTIES (H5REPART-h5repart_20K PROPERTIES DEPENDS H5REPART-clearall-objects)
 
-  # Remove any output file left over from previous test run
-  ADD_TEST (
-      NAME h5repart_5K-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          scd_family00000.h5
-          scd_family00001.h5
-          scd_family00002.h5
-          scd_family00003.h5
-  )
-  SET_TESTS_PROPERTIES (h5repart_5K-clear-objects PROPERTIES DEPENDS h5repart_20K)
   # repartition family member size to 5 KB.
-  ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5)
-  SET_TESTS_PROPERTIES (h5repart_5K PROPERTIES DEPENDS h5repart_5K-clear-objects)
+  ADD_TEST (NAME H5REPART-h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5)
+  SET_TESTS_PROPERTIES (H5REPART-h5repart_5K PROPERTIES DEPENDS H5REPART-clearall-objects)
 
-  # Remove any output file left over from previous test run
-  ADD_TEST (
-      NAME h5repart_sec2-clear-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove 
-          family_to_sec2.h5
-  )
-  SET_TESTS_PROPERTIES (h5repart_sec2-clear-objects PROPERTIES DEPENDS h5repart_5K)
   # convert family file to sec2 file of 20,000 bytes
-  ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)
-  SET_TESTS_PROPERTIES (h5repart_sec2 PROPERTIES DEPENDS h5repart_sec2-clear-objects)
+  ADD_TEST (NAME H5REPART-h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)
+  SET_TESTS_PROPERTIES (H5REPART-h5repart_sec2 PROPERTIES DEPENDS H5REPART-clearall-objects)
 
   # test the output files repartitioned above.
-  ADD_TEST (NAME h5repart_test COMMAND $<TARGET_FILE:h5repart_test>)
-  SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2)
+  ADD_TEST (NAME H5REPART-h5repart_test COMMAND $<TARGET_FILE:h5repart_test>)
+  SET_TESTS_PROPERTIES (H5REPART-h5repart_test PROPERTIES DEPENDS H5REPART-clearall-objects H5REPART-h5repart_20KH5REPART-h5repart_5K H5REPART-h5repart_sec2)
 
   SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
         h5repart_test
   )
+  
+  IF (HDF5_ENABLE_USING_MEMCHECKER)
+    ADD_TEST (
+        NAME H5MKGRP-clearall-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E remove 
+                h5mkgrp_help.out
+                h5mkgrp_help.out.err
+                h5mkgrp_version.out
+                h5mkgrp_version.out.err
+                h5mkgrp_single.h5 
+                h5mkgrp_single.out
+                h5mkgrp_single.out.err
+                h5mkgrp_single_v.h5 
+                h5mkgrp_single_v.out
+                h5mkgrp_single_v.out.err
+                h5mkgrp_single_p.h5 
+                h5mkgrp_single_p.out
+                h5mkgrp_single_p.out.err
+                h5mkgrp_single_l.h5 
+                h5mkgrp_single_l.out
+                h5mkgrp_single_l.out.err
+                h5mkgrp_several.h5 
+                h5mkgrp_several.out
+                h5mkgrp_several.out.err
+                h5mkgrp_several_v.h5 
+                h5mkgrp_several_v.out
+                h5mkgrp_several_v.out.err
+                h5mkgrp_several_p.h5 
+                h5mkgrp_several_p.out
+                h5mkgrp_several_p.out.err
+                h5mkgrp_several_l.h5 
+                h5mkgrp_several_l.out
+                h5mkgrp_several_l.out.err
+                h5mkgrp_nested_p.h5 
+                h5mkgrp_nested_p.out
+                h5mkgrp_nested_p.out.err
+                h5mkgrp_nested_lp.h5 
+                h5mkgrp_nested_lp.out
+                h5mkgrp_nested_lp.out.err
+                h5mkgrp_nested_mult_p.h5 
+                h5mkgrp_nested_mult_p.out
+                h5mkgrp_nested_mult_p.out.err
+                h5mkgrp_nested_mult_lp.h5 
+                h5mkgrp_nested_mult_lp.out
+                h5mkgrp_nested_mult_lp.out.err
+    )
+    SET_TESTS_PROPERTIES (H5MKGRP-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (H5MKGRP-clearall-objects PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "H5MKGRP-clearall-objects")
+  ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
 
   # Check that help & version is displayed properly
   ADD_H5_CMP (h5mkgrp_help 0 "-h")
   ADD_H5_CMP (h5mkgrp_version 0 "-V")
 
   # Create single group at root level
-  ADD_H5_TEST (h5mkgrp_single 0 " " single)
-  ADD_H5_TEST (h5mkgrp_single 0 "-v" single)
-  ADD_H5_TEST (h5mkgrp_single 0 "-p" single)
-  ADD_H5_TEST (h5mkgrp_single_latest 0 "-l" latest)
+  ADD_H5_TEST (h5mkgrp_single 0 "" single)
+  ADD_H5_TEST (h5mkgrp_single_v 0 "-v" single)
+  ADD_H5_TEST (h5mkgrp_single_p 0 "-p" single)
+  ADD_H5_TEST (h5mkgrp_single_l 0 "-l" latest)
 
   # Create several groups at root level
-  ADD_H5_TEST (h5mkgrp_several 0 " " one two)
-  ADD_H5_TEST (h5mkgrp_several 0 "-v" one two)
-  ADD_H5_TEST (h5mkgrp_several 0 "-p" one two)
-  ADD_H5_TEST (h5mkgrp_several_latest 0 "-l" one two)
+  ADD_H5_TEST (h5mkgrp_several 0 "" one two)
+  ADD_H5_TEST (h5mkgrp_several_v 0 "-v" one two)
+  ADD_H5_TEST (h5mkgrp_several_p 0 "-p" one two)
+  ADD_H5_TEST (h5mkgrp_several_l 0 "-l" one two)
 
   # Create various nested groups 
-  ADD_H5_TEST (h5mkgrp_nested 0 "-p" /one/two)
-  ADD_H5_TEST (h5mkgrp_nested_latest 0 "-lp" /one/two)
-  ADD_H5_TEST (h5mkgrp_nested_mult 0 "-p" /one/two /three/four)
-  ADD_H5_TEST (h5mkgrp_nested_mult_latest 0 "-lp" /one/two /three/four)
+  ADD_H5_TEST (h5mkgrp_nested_p 0 "-p" /one/two)
+  ADD_H5_TEST (h5mkgrp_nested_lp 0 "-lp" /one/two)
+  ADD_H5_TEST (h5mkgrp_nested_mult_p 0 "-p" /one/two /three/four)
+  ADD_H5_TEST (h5mkgrp_nested_mult_lp 0 "-lp" /one/two /three/four)
 ENDIF (BUILD_TESTING)
 
 ##############################################################################
diff --git a/tools/misc/testh5mkgrp.sh.in b/tools/misc/testh5mkgrp.sh.in
index dc127e8..5ec1a28 100644
--- a/tools/misc/testh5mkgrp.sh.in
+++ b/tools/misc/testh5mkgrp.sh.in
@@ -31,15 +31,85 @@ H5LS=h5ls                   # The h5ls tool name
 H5LS_ARGS=-vr               # Arguments to the h5ls tool
 H5LS_BIN=`pwd`/../h5ls/$H5LS # The path of the h5ls tool binary
 
+CMP='cmp'
+DIFF='diff -c'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
 nerrors=0
 verbose=yes
 
-INDIR=$srcdir/../testfiles
-OUTDIR=../testfiles
+# source dirs
+SRC_TOOLS="$srcdir/../"
+
+SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+# testfiles source dirs for tools
+SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/misc/testfiles"
+
+TESTDIR=./testfiles
+test -d $TESTDIR || mkdir -p $TESTDIR
+
+######################################################################
+# test files
+# --------------------------------------------------------------------
+# All the test files copy from source directory to test directory
+# NOTE: Keep this framework to add/remove test files.
+#       Any test files from other tools can be used in this framework.
+#       This list are also used for checking exist.
+#       Comment '#' without space can be used.
+# --------------------------------------------------------------------
+
 CMP='cmp -s'
 DIFF='diff -c'
 
-test -d $OUTDIR || mkdir $OUTDIR
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="
+$SRC_H5MKGRP_TESTFILES/h5mkgrp_help.txt
+$SRC_TOOLS_TESTFILES/h5mkgrp_single.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_single_v.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_single_p.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_single_l.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_several.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_several_v.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_several_p.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_several_l.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_nested_p.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_nested_lp.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_p.ls
+$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_lp.ls
+"
+
+COPY_TESTFILES_TO_TESTDIR()
+{
+    # copy test files. Used -f to make sure get a new copy
+    for tstfile in $COPY_TESTFILES
+    do
+        # ignore '#' comment
+        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+        RET=$?
+        if [ $RET -eq 1 ]; then
+            # skip cp if srcdir is same as destdir
+            # this occurs when build/test performed in source dir and
+            # make cp fail
+            SDIR=`$DIRNAME $tstfile`
+            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+                $CP -f $tstfile $TESTDIR
+                if [ $? -ne 0 ]; then
+                    echo "Error: FAILED to copy $tstfile ."
+                
+                    # Comment out this to CREATE expected file
+                    exit $EXIT_FAILURE
+                fi
+            fi
+        fi
+    done
+}
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -71,9 +141,7 @@ TOOLTEST()
 {
     TESTING $H5MKGRP $@
     (
-    echo "#############################"
-    echo " output for '$H5MKGRP $@'"
-    echo "#############################"
+    cd $TESTDIR
     $RUNSERIAL $H5MKGRP_BIN $@
     ) > output.out
     RET=$?
@@ -96,17 +164,15 @@ TOOLTEST()
 #
 H5LSTEST() 
 {
-    expect="$INDIR/`basename $1 .h5`.ls"
-    actual="$OUTDIR/`basename $1 .h5`.out"
+    expect="$TESTDIR/`basename $1 .h5`.ls"
+    actual="$TESTDIR/`basename $1 .h5`.out"
     actual_sav=${actual}-sav
 
     # Stderr is included in stdout so that the diff can detect
     # any unexpected output from that stream too.
     VERIFY_H5LS  $@
     (
-      echo "#############################"
-      echo "Expected output for '$H5LS $@'" 
-      echo "#############################"
+      cd $TESTDIR
       $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
     ) 2>&1 |sed 's/Modified:.*/Modified:  XXXX-XX-XX XX:XX:XX XXX/' >$actual
 
@@ -142,7 +208,7 @@ H5LSTEST()
 # $* are groups to create
 RUNTEST() 
 {
-    FILEOUT=$OUTDIR/$1
+    FILEOUT=$1
     shift
     H5MKGRP_ARGS=$1
     shift
@@ -158,9 +224,8 @@ RUNTEST()
 
     # Remove output file created, if the "no cleanup" environment variable is
     #   not defined
-echo "FILEOUT=" $FILEOUT
     if test -z "$HDF5_NOCLEANUP"; then
-        rm -f $FILEOUT
+        rm -f $TESTDIR/$FILEOUT
     fi
 }
 
@@ -172,16 +237,17 @@ echo "FILEOUT=" $FILEOUT
 # $* are groups to create
 CMPTEST() 
 {
-    FILEOUT=$OUTDIR/$1
-    expect="$srcdir/testfiles/`basename $1 .h5`.txt"
-    actual="$OUTDIR/`basename $1 .h5`.out"
-    actual_err="$OUTDIR/`basename $1 .h5`.err"
+    FILEOUT=$1
+    expect="$TESTDIR/`basename $1 .h5`.txt"
+    actual="$TESTDIR/`basename $1 .h5`.out"
+    actual_err="$TESTDIR/`basename $1 .h5`.err"
     shift
 
     # Stderr is included in stdout so that the diff can detect
     # any unexpected output from that stream too.
     TESTING $H5MKGRP $@
     (
+    cd $TESTDIR
     $RUNSERIAL $H5MKGRP_BIN $@
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
@@ -208,28 +274,30 @@ CMPTEST()
 ##############################################################################
 ###           T H E   T E S T S                                            ###
 ##############################################################################
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
 
 # Check that help & version is displayed properly
 CMPTEST h5mkgrp_help.h5 "-h"
-RUNTEST h5mkgrp_version.h5 "-V"
+#CMPTEST h5mkgrp_version.h5 "-V"
 
 # Create single group at root level
 RUNTEST h5mkgrp_single.h5 " " single
-RUNTEST h5mkgrp_single.h5 "-v" single
-RUNTEST h5mkgrp_single.h5 "-p" single
-RUNTEST h5mkgrp_single_latest.h5 "-l" latest
+RUNTEST h5mkgrp_single_v.h5 "-v" single
+RUNTEST h5mkgrp_single_p.h5 "-p" single
+RUNTEST h5mkgrp_single_l.h5 "-l" latest
 
 # Create several groups at root level
 RUNTEST h5mkgrp_several.h5 " " one two
-RUNTEST h5mkgrp_several.h5 "-v" one two
-RUNTEST h5mkgrp_several.h5 "-p" one two
-RUNTEST h5mkgrp_several_latest.h5 "-l" one two
+RUNTEST h5mkgrp_several_v.h5 "-v" one two
+RUNTEST h5mkgrp_several_p.h5 "-p" one two
+RUNTEST h5mkgrp_several_l.h5 "-l" one two
 
 # Create various nested groups 
-RUNTEST h5mkgrp_nested.h5 "-p" /one/two
-RUNTEST h5mkgrp_nested_latest.h5 "-lp" /one/two
-RUNTEST h5mkgrp_nested_mult.h5 "-p" /one/two /three/four
-RUNTEST h5mkgrp_nested_mult_latest.h5 "-lp" /one/two /three/four
+RUNTEST h5mkgrp_nested_p.h5 "-p" /one/two
+RUNTEST h5mkgrp_nested_lp.h5 "-lp" /one/two
+RUNTEST h5mkgrp_nested_mult_p.h5 "-p" /one/two /three/four
+RUNTEST h5mkgrp_nested_mult_lp.h5 "-lp" /one/two /three/four
 
 
 if test $nerrors -eq 0 ; then
diff --git a/tools/testfiles/h5mkgrp_help.ls b/tools/testfiles/h5mkgrp_help.ls
deleted file mode 100644
index ad2bd0f..0000000
--- a/tools/testfiles/h5mkgrp_help.ls
+++ /dev/null
@@ -1,4 +0,0 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_help.h5'
-#############################
-../testfiles/h5mkgrp_help.h5: unable to open file
diff --git a/tools/testfiles/h5mkgrp_nested_latest.ls b/tools/testfiles/h5mkgrp_nested_lp.ls
index c00292d..1fe8ce8 100644
--- a/tools/testfiles/h5mkgrp_nested_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_lp.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_nested_latest.h5'
-#############################
-Opened "../testfiles/h5mkgrp_nested_latest.h5" with sec2 driver.
+Opened "h5mkgrp_nested_lp.h5" with sec2 driver.
 /                        Group
     Location:  1:48
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_mult_latest.ls b/tools/testfiles/h5mkgrp_nested_mult_lp.ls
index 0b19ff9..50380ec 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_latest.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult_lp.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult_latest.h5'
-#############################
-Opened "../testfiles/h5mkgrp_nested_mult_latest.h5" with sec2 driver.
+Opened "h5mkgrp_nested_mult_lp.h5" with sec2 driver.
 /                        Group
     Location:  1:48
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested_mult.ls b/tools/testfiles/h5mkgrp_nested_mult_p.ls
index 6a22ffd..f2b3b4b 100644
--- a/tools/testfiles/h5mkgrp_nested_mult.ls
+++ b/tools/testfiles/h5mkgrp_nested_mult_p.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_nested_mult.h5'
-#############################
-Opened "../testfiles/h5mkgrp_nested_mult.h5" with sec2 driver.
+Opened "h5mkgrp_nested_mult_p.h5" with sec2 driver.
 /                        Group
     Location:  1:96
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_nested.ls b/tools/testfiles/h5mkgrp_nested_p.ls
index 472656d..3034dbb 100644
--- a/tools/testfiles/h5mkgrp_nested.ls
+++ b/tools/testfiles/h5mkgrp_nested_p.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_nested.h5'
-#############################
-Opened "../testfiles/h5mkgrp_nested.h5" with sec2 driver.
+Opened "h5mkgrp_nested_p.h5" with sec2 driver.
 /                        Group
     Location:  1:96
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/testfiles/h5mkgrp_several.ls
index bbf5c92..68a3f9c 100644
--- a/tools/testfiles/h5mkgrp_several.ls
+++ b/tools/testfiles/h5mkgrp_several.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_several.h5'
-#############################
-Opened "../testfiles/h5mkgrp_several.h5" with sec2 driver.
+Opened "h5mkgrp_several.h5" with sec2 driver.
 /                        Group
     Location:  1:96
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several_latest.ls b/tools/testfiles/h5mkgrp_several_l.ls
index a3b5224..5e1b4be 100644
--- a/tools/testfiles/h5mkgrp_several_latest.ls
+++ b/tools/testfiles/h5mkgrp_several_l.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_several_latest.h5'
-#############################
-Opened "../testfiles/h5mkgrp_several_latest.h5" with sec2 driver.
+Opened "h5mkgrp_several_l.h5" with sec2 driver.
 /                        Group
     Location:  1:48
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_several_p.ls b/tools/testfiles/h5mkgrp_several_p.ls
new file mode 100644
index 0000000..43f1ce5
--- /dev/null
+++ b/tools/testfiles/h5mkgrp_several_p.ls
@@ -0,0 +1,10 @@
+Opened "h5mkgrp_several_p.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
+/one                     Group
+    Location:  1:800
+    Links:     1
+/two                     Group
+    Location:  1:1832
+    Links:     1
diff --git a/tools/testfiles/h5mkgrp_several_v.ls b/tools/testfiles/h5mkgrp_several_v.ls
new file mode 100644
index 0000000..a6df87b
--- /dev/null
+++ b/tools/testfiles/h5mkgrp_several_v.ls
@@ -0,0 +1,10 @@
+Opened "h5mkgrp_several_v.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
+/one                     Group
+    Location:  1:800
+    Links:     1
+/two                     Group
+    Location:  1:1832
+    Links:     1
diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/testfiles/h5mkgrp_single.ls
index e9932f7..f2bd01c 100644
--- a/tools/testfiles/h5mkgrp_single.ls
+++ b/tools/testfiles/h5mkgrp_single.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_single.h5'
-#############################
-Opened "../testfiles/h5mkgrp_single.h5" with sec2 driver.
+Opened "h5mkgrp_single.h5" with sec2 driver.
 /                        Group
     Location:  1:96
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_single_latest.ls b/tools/testfiles/h5mkgrp_single_l.ls
index b6e6ea4..1763a61 100644
--- a/tools/testfiles/h5mkgrp_single_latest.ls
+++ b/tools/testfiles/h5mkgrp_single_l.ls
@@ -1,7 +1,4 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_single_latest.h5'
-#############################
-Opened "../testfiles/h5mkgrp_single_latest.h5" with sec2 driver.
+Opened "h5mkgrp_single_l.h5" with sec2 driver.
 /                        Group
     Location:  1:48
     Links:     1
diff --git a/tools/testfiles/h5mkgrp_single_p.ls b/tools/testfiles/h5mkgrp_single_p.ls
new file mode 100644
index 0000000..e82dc31
--- /dev/null
+++ b/tools/testfiles/h5mkgrp_single_p.ls
@@ -0,0 +1,7 @@
+Opened "h5mkgrp_single_p.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
+/single                  Group
+    Location:  1:800
+    Links:     1
diff --git a/tools/testfiles/h5mkgrp_single_v.ls b/tools/testfiles/h5mkgrp_single_v.ls
new file mode 100644
index 0000000..7360865
--- /dev/null
+++ b/tools/testfiles/h5mkgrp_single_v.ls
@@ -0,0 +1,7 @@
+Opened "h5mkgrp_single_v.h5" with sec2 driver.
+/                        Group
+    Location:  1:96
+    Links:     1
+/single                  Group
+    Location:  1:800
+    Links:     1
diff --git a/tools/testfiles/h5mkgrp_version.ls b/tools/testfiles/h5mkgrp_version.ls
deleted file mode 100644
index 907f0ad..0000000
--- a/tools/testfiles/h5mkgrp_version.ls
+++ /dev/null
@@ -1,4 +0,0 @@
-#############################
-Expected output for 'h5ls ../testfiles/h5mkgrp_version.h5'
-#############################
-../testfiles/h5mkgrp_version.h5: unable to open file