[svn-r20041] Created valgrind cacheinit file, Corrected ignore list, updated memcheck defines

2011-02-04 14:54:47 -05:00
parent 06b4b0a755
commit 94cdd543ad
4 changed files with 96 additions and 34 deletions
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -16,7 +16,9 @@ SET (UPDATE_TYPE svn)
 SET (VALGRIND_COMMAND "/usr/bin/valgrind")
 SET (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
 SET (MEMORYCHECK_COMMAND "/usr/bin/valgrind")
+SET (MEMORYCHECKCOMMAND "/usr/bin/valgrind")
 SET (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
+SET (CTEST_MEMORYCHECKCOMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")

 SET (CTEST_TESTING_TIMEOUT 3600) 
 SET (DART_TESTING_TIMEOUT 3600) 
--- a/2
+++ b/2
@@ -1210,6 +1210,7 @@
 ./tools/testfiles/tgroup-1.ddl
 ./tools/testfiles/tgroup-2.ddl
 ./tools/testfiles/tgroup.h5
+./tools/testfiles/tgrp_comments.ls
 ./tools/testfiles/tgrp_comments.ddl
 ./tools/testfiles/tgrp_comments.h5
 ./tools/testfiles/thlink-1.ddl
@@ -1976,6 +1977,7 @@
 ./config/cmake/HDF5Macros.cmake
 ./config/cmake/libhdf5.settings.cmake.in
 ./config/cmake/cacheinit.cmake
+./config/cmake/mccacheinit.cmake
 ./config/cmake/CTest.cmake
 ./config/cmake/grepTest.cmake
 ./config/cmake/runTest.cmake
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -252,40 +252,40 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
    H5DUMP-tpbitsSignedLongLongWhole      #uses runTest.cmake
    H5DUMP-tpbitsSignedLongLongWhole63    #uses runTest.cmake
    H5DUMP-tpbitsSignedLongLongWhole1     #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedWhole              #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedIntWhole           #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongWhole          #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLongWhole      #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLongWhole63    #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLongWhole1     #uses runTest.cmake
-    H5DUMP-tpbitsSigned2                     #uses runTest.cmake
-    H5DUMP-tpbitsSigned4                     #uses runTest.cmake
-    H5DUMP-tpbitsSignedInt                   #uses runTest.cmake
-    H5DUMP-tpbitsSignedInt4                  #uses runTest.cmake
-    H5DUMP-tpbitsSignedInt8                  #uses runTest.cmake
-    H5DUMP-tpbitsSignedLong                  #uses runTest.cmake
-    H5DUMP-tpbitsSignedLong8                 #uses runTest.cmake
-    H5DUMP-tpbitsSignedLong16                #uses runTest.cmake
-    H5DUMP-tpbitsSignedLongLong              #uses runTest.cmake
-    H5DUMP-tpbitsSignedLongLong16            #uses runTest.cmake
-    H5DUMP-tpbitsSignedLongLong32            #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSigned2             #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSigned4             #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedInt           #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedInt4          #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedInt8          #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLong          #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLong8         #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLong16        #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLong      #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLong16    #uses runTest.cmake
-    H5DUMP-tpbitsUnsignedSignedLongLong32    #uses runTest.cmake
-    H5DUMP-tpbitsCharOffsetExceeded          #uses runTest.cmake
-    H5DUMP-tpbitsIntOffsetExceeded           #uses runTest.cmake
-    H5DUMP-tpbitsLongOffsetExceeded          #uses runTest.cmake
-    H5DUMP-tpbitsCharLengthExceeded          #uses runTest.cmake
-    H5DUMP-tpbitsIntLengthExceeded           #uses runTest.cmake
-    H5DUMP-tpbitsLongLengthExceeded          #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedWhole            #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedIntWhole         #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongWhole        #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLongWhole    #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLongWhole63  #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLongWhole1   #uses runTest.cmake
+    H5DUMP-tpbitsSigned2                  #uses runTest.cmake
+    H5DUMP-tpbitsSigned4                  #uses runTest.cmake
+    H5DUMP-tpbitsSignedInt                #uses runTest.cmake
+    H5DUMP-tpbitsSignedInt4               #uses runTest.cmake
+    H5DUMP-tpbitsSignedInt8               #uses runTest.cmake
+    H5DUMP-tpbitsSignedLong               #uses runTest.cmake
+    H5DUMP-tpbitsSignedLong8              #uses runTest.cmake
+    H5DUMP-tpbitsSignedLong16             #uses runTest.cmake
+    H5DUMP-tpbitsSignedLongLong           #uses runTest.cmake
+    H5DUMP-tpbitsSignedLongLong16         #uses runTest.cmake
+    H5DUMP-tpbitsSignedLongLong32         #uses runTest.cmake
+    H5DUMP-tpbitsUnsigned2                #uses runTest.cmake
+    H5DUMP-tpbitsUnsigned4                #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedInt              #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedInt4             #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedInt8             #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLong             #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLong8            #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLong16           #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLong         #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLong16       #uses runTest.cmake
+    H5DUMP-tpbitsUnsignedLongLong32       #uses runTest.cmake
+    H5DUMP-tpbitsCharOffsetExceeded       #uses runTest.cmake
+    H5DUMP-tpbitsIntOffsetExceeded        #uses runTest.cmake
+    H5DUMP-tpbitsLongOffsetExceeded       #uses runTest.cmake
+    H5DUMP-tpbitsCharLengthExceeded       #uses runTest.cmake
+    H5DUMP-tpbitsIntLengthExceeded        #uses runTest.cmake
+    H5DUMP-tpbitsLongLengthExceeded       #uses runTest.cmake
    H5DUMP-treference      #uses runTest.cmake
    H5DUMP-tstringe        #uses runTest.cmake
    H5DUMP-tstring         #uses runTest.cmake
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -0,0 +1,58 @@
+# This is the CMakeCache file.
+
+########################
+# EXTERNAL cache entries
+########################
+
+SET (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
+
+SET (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)
+
+SET (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)
+
+SET (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)
+
+SET (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)
+
+SET (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)
+
+SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)
+
+SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
+
+SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
+
+SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
+
+SET (HDF5_USE_H5DUMP_PACKED_BITS ON CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE)
+
+SET (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)
+
+SET (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)
+
+SET (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)
+
+SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
+
+SET (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)
+
+SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
+
+SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)
+
+SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
+
+SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
+
+SET (HDF5_ALLOW_EXTERNAL_SUPPORT "SVN" CACHE STRING "Allow External Library Building" FORCE)
+
+SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)
+
+SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)
+
+SET (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+
+SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+
+SET (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
+