[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 137 insertions, 112 deletions

diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 6956c4e..0dec21c 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -1,11 +1,10 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.6)
 PROJECT (HDF5_TOOLS_H5LS)
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
-INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
 
 #-----------------------------------------------------------------------------
 # Add the h5ls executable
@@ -13,6 +12,7 @@ INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
 ADD_EXECUTABLE (h5ls ${HDF5_TOOLS_H5LS_SOURCE_DIR}/h5ls.c)
 TARGET_NAMING (h5ls ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (h5ls  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+SET_TARGET_PROPERTIES (h5ls PROPERTIES FOLDER tools)
 
 SET (H5_DEP_EXECUTABLES
     h5ls
@@ -26,108 +26,107 @@ SET (H5_DEP_EXECUTABLES
 
 IF (BUILD_TESTING)
   # --------------------------------------------------------------------
-  # Copy all the HDF5 files from the test directory into the source directory
+  # Copy all the test files from source directory to test directory
   # --------------------------------------------------------------------
-  SET (HDF5_REFERENCE_FILES
-      help-1.ls
-      help-2.ls
-      help-3.ls
-      nosuchfile.ls
-      tall-1.ls
-      tall-2.ls
-      tarray1.ls
-      tattr2.ls
-      tcomp-1.ls
-      tdataregbe.ls
-      tdataregle.ls
-      tdset-1.ls
-      tempty.ls
-      textlink-1.ls
-      textlinksrc-1.ls
-      textlinksrc-2.ls
-      textlinksrc-3.ls
-      textlinksrc-4.ls
-      textlinksrc-5.ls
-      textlinksrc-6.ls
-      textlinksrc-7.ls
-      textlinksrc-1-old.ls
-      textlinksrc-2-old.ls
-      textlinksrc-3-old.ls
-      textlinksrc-6-old.ls
-      textlinksrc-7-old.ls
-      tsoftlinks-1.ls
-      tsoftlinks-2.ls
-      tsoftlinks-3.ls
-      tsoftlinks-4.ls
-      tsoftlinks-5.ls
-      textlinksrc-nodangle-1.ls
-      textlinksrc-nodangle-2.ls
-      tgrp_comments.ls
-      tsoftlinks-nodangle-1.ls
-      thlinks-nodangle-1.ls
-      tgroup.ls
-      tgroup-1.ls
-      tgroup-2.ls
-      tgroup-3.ls
-      thlink-1.ls
-      tloop-1.ls
-      tnestcomp-1.ls
-      tnestcomp-2.ls
-      tnestcomp-3.ls
-      tnestcomp-4.ls
-      tsaf.ls
-      tslink-1.ls
-      tstr-1.ls
-      tudlink-1.ls
-      tvldtypes1.ls
-      tvldtypes2le.ls
-      tvldtypes2be.ls
+  SET (LIST_HDF5_TEST_FILES
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdatareg.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.h5
   )
-  SET (HDF5_REFERENCE_TEST_FILES
-      tall.h5
-      tarray1.h5
-      tattr2.h5
-      tcompound.h5
-      tdatareg.h5
-      tdset.h5
-      tempty.h5
-      textlink.h5
-      textlinksrc.h5
-      textlinktar.h5
-      tgroup.h5
-      tgrp_comments.h5
-      thlink.h5
-      tloop.h5
-      tnestedcomp.h5
-      tsaf.h5
-      tslink.h5
-      tsoftlinks.h5
-      tstr.h5
-      tudlink.h5
-      tvldtypes1.h5
+
+  SET (LIST_OTHER_TEST_FILES
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/help-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/nosuchfile.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tall-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tarray1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattr2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_le.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tattrreg_be.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tcomp-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregbe.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdataregle.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tdset-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-4.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-5.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-1-old.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-2-old.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-3-old.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-6-old.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-7-old.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-4.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-5.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinksrc-nodangle-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsoftlinks-nodangle-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlinks-nodangle-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-2.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-4.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tsaf.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tslink-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tstr-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tudlink-1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes1.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2le.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tvldtypes2be.ls
   )
 
-  FOREACH (ls_file ${HDF5_REFERENCE_FILES})
-    SET (lsdest "${PROJECT_BINARY_DIR}/${ls_file}")
-    #MESSAGE (STATUS " Translating ${ls_file}")
-    ADD_CUSTOM_COMMAND (
-        TARGET     h5ls
-        POST_BUILD
-        COMMAND    ${XLATE_UTILITY}
-        ARGS       ${HDF5_TOOLS_SRC_DIR}/testfiles/${ls_file} ${lsdest} -l3
-    )
-  ENDFOREACH (ls_file ${HDF5_REFERENCE_FILES})
+  FILE (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
-  FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    SET (dest "${PROJECT_BINARY_DIR}/${h5_file}")
-    #MESSAGE (STATUS " Copying ${h5_file}")
+  # copy the list of test files
+  FOREACH (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
+    GET_FILENAME_COMPONENT(fname "${listfiles}" NAME)
+    SET (dest "${PROJECT_BINARY_DIR}/testfiles/${fname}")
+    #MESSAGE (STATUS " Copying ${listfiles} to ${dest}")
     ADD_CUSTOM_COMMAND (
         TARGET     h5ls
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${h5_file} ${dest}
+        ARGS       -E copy_if_different ${listfiles} ${dest}
     )
-  ENDFOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES})
+  ENDFOREACH (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
+
   
 ##############################################################################
 ##############################################################################
@@ -139,26 +138,33 @@ IF (BUILD_TESTING)
     # If using memchecker add tests without using scripts
     IF (HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls> ${ARGN})
+      SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       IF (${resultcode} STREQUAL "1")
         SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       ENDIF (${resultcode} STREQUAL "1")
+      IF (NOT "${last_test}" STREQUAL "")
+        SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
+      ENDIF (NOT "${last_test}" STREQUAL "")
+      SET (last_test "H5LS-${resultfile}")
     ELSE (HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (
+          NAME H5LS-clear-${resultfile}-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove ./testfiles/${resultfile}.out ./testfiles/${resultfile}.out.err
+      )
+      ADD_TEST (
           NAME H5LS-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5ls>"
               -D "TEST_ARGS=${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}.ls"
               -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
       )
+      SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS "H5LS-clear-${resultfile}-objects")
     ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
-    IF (NOT "${last_test}" STREQUAL "")
-      SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
-    ENDIF (NOT "${last_test}" STREQUAL "")
-    SET (last_test "H5LS-${resultfile}")
   ENDMACRO (ADD_H5_TEST file)
 
 ##############################################################################
@@ -167,8 +173,9 @@ IF (BUILD_TESTING)
 ##############################################################################
 ##############################################################################
 
-  # Remove any output file left over from previous test run
-  ADD_TEST (
+  IF (HDF5_ENABLE_USING_MEMCHECKER)
+    # Remove any output file left over from previous test run
+    ADD_TEST (
       NAME H5LS-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
@@ -278,11 +285,12 @@ IF (BUILD_TESTING)
           tvldtypes2le.out.err
           tvldtypes2be.out
           tvldtypes2be.out.err
-  )
-  IF (NOT "${last_test}" STREQUAL "")
-    SET_TESTS_PROPERTIES (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test})
-  ENDIF (NOT "${last_test}" STREQUAL "")
-  SET (last_test "H5LS-clearall-objects")
+    )
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "H5LS-clearall-objects")
+  ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
 
   # test the help syntax
   ADD_H5_TEST (help-1 0 -w80 -h)
@@ -347,6 +355,11 @@ IF (BUILD_TESTING)
   # when used file with no dangling links - expected exit code 0
   ADD_H5_TEST (thlinks-nodangle-1 0 -w80 --follow-symlinks --no-dangling-links thlink.h5)
 
+# test for wildcards in filename (does not work with cmake)
+#  ADD_H5_TEST (tstarfile 0 -w80 t*link.h5)
+#  ADD_H5_TEST (tqmarkfile 0 -w80 t?link.h5)
+  ADD_H5_TEST (tmultifile 0 -w80 thlink.h5 tslink.h5)
+
   # tests for hard links
   ADD_H5_TEST (thlink-1 0 -w80 thlink.h5)
 
@@ -384,18 +397,30 @@ IF (BUILD_TESTING)
   # enable -S for avoiding printing NATIVE types
   ADD_H5_TEST (tattr2 0 -w80 -v -S tattr2.h5)
 
+  # test for attribute with region references wo verbose mode
+  # ( HDFFV-7838, )
+  IF (H5_WORDS_BIGENDIAN)
+    ADD_H5_TEST (tattrreg_be 0 -w80 -v -d tattrreg.h5)
+  ELSE (H5_WORDS_BIGENDIAN)
+    ADD_H5_TEST (tattrreg_le 0 -w80 -v -d tattrreg.h5)
+  ENDIF (H5_WORDS_BIGENDIAN)
+
   # test for non-existing file
   ADD_H5_TEST (nosuchfile 1 nosuchfile.h5)
 
-  IF (WORDS_BIGENDIAN)
-    # test for variable length data types in verbose mode
+  # test for variable length data types in verbose mode
+  IF (H5_WORDS_BIGENDIAN)
     ADD_H5_TEST (tvldtypes2be 0 -v tvldtypes1.h5)
-    # test for dataset region references data types in verbose mode
-    ADD_H5_TEST (tdataregbe 0 -v tdatareg.h5)
-  ELSE (WORDS_BIGENDIAN)
+  ELSE (H5_WORDS_BIGENDIAN)
     ADD_H5_TEST (tvldtypes2le 0 -v tvldtypes1.h5)
+  ENDIF (H5_WORDS_BIGENDIAN)
+
+  # test for dataset region references data types in verbose mode
+  IF (H5_WORDS_BIGENDIAN)
+    ADD_H5_TEST (tdataregbe 0 -v tdatareg.h5)
+  ELSE (H5_WORDS_BIGENDIAN)
     ADD_H5_TEST (tdataregle 0 -v tdatareg.h5)
-  ENDIF (WORDS_BIGENDIAN)
+  ENDIF (H5_WORDS_BIGENDIAN)
 
 ENDIF (BUILD_TESTING)