From 949853b04726cee02873da34d753dd94740345fe Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 4 May 2016 10:19:34 -0500
Subject: [svn-r29864] Add ignore test names for Valgrind process. Add files to
 clear test generated files tests.

---
 config/cmake/CTestCustom.cmake       | 13 ++++++++++---
 examples/CMakeTests.cmake            | 14 ++++++++++++++
 hl/fortran/examples/CMakeTests.cmake | 11 +++++++++++
 hl/fortran/test/CMakeTests.cmake     |  2 ++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 85f7d27..a1cbb0c 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -1,5 +1,5 @@
 set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
- 
+
 set (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
 #    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
@@ -16,7 +16,7 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
 #    "note: expanded from macro"
 #    "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro"
 )
- 
+
 set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ${CTEST_CUSTOM_MEMCHECK_IGNORE}
     H5TEST-flush1           #designed to fail
@@ -37,7 +37,9 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     PERFORM_h5perform-clear-objects
     HL_TOOLS-clear-objects
     HL_test-clear-objects
-    HL_fortran_test-clear-objects
+    HL_FORTRAN_test-clear-objects
+    FORTRAN_testhdf5-clear-objects
+    CPP_testhdf5-clear-objects
     ######### tools/h5copy #########
     H5COPY-clearall-objects
     ######### tools/h5diff #########
@@ -48,6 +50,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5DUMP-XML-clearall-objects
     H5DUMP_VDS-clearall-objects
     ######### tools/h5import #########
+    H5IMPORT-h5importtest-clear-objects
     H5IMPORT-clear-objects
     ######### tools/h5jam #########
     H5JAM-SETUP-N_twithub_u10_c-clear-objects
@@ -213,4 +216,8 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ######### examples #########
     EXAMPLES-clear-objects
     CPP_ex-clear-objects
+    CPP_ex_tutr-clear-objects
+    HL_ex-clear-objects
+    f90_ex-clear-objects
+    HL_FORTRAN_f90_ex-clear-objects
 )
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index 2cf82b8..4a4728e 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -47,6 +47,7 @@
           red/prefix_target.h5
           u2w/u2w_target.h5
           vds.h5
+          vds-exc.h5
           vds-excalibur.h5
           vds-exclim.h5
           vds-percival.h5
@@ -106,6 +107,19 @@
             soft_link.h5
             subset.h5
             unix2win.h5
+            vds.h5
+            vds-exc.h5
+            vds-excalibur.h5
+            vds-exclim.h5
+            vds-percival.h5
+            vds-percival-unlim.h5
+            vds-percival-unlim-maxmin.h5
+            a.h5
+            b.h5
+            c.h5
+            d.h5
+            vds-simpleIO.h5
+            vds-eiger.h5
             blue/prefix_target.h5
             red/prefix_target.h5
             u2w/u2w_target.h5
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 954a01b..2c10295 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -5,6 +5,17 @@
 ##############################################################################
 ##############################################################################
 
+# Remove any output file left over from previous test run
+add_test (
+    NAME HL_FORTRAN_f90_ex-clear-objects
+    COMMAND    ${CMAKE_COMMAND}
+        -E remove
+        ex_ds1.h5
+        exlite.h5
+)
+
+
 foreach (example ${examples})
   add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
+  set_tests_properties (HL_FORTRAN_f90_ex_${example} PROPERTIES DEPENDS HL_FORTRAN_f90_ex-clear-objects)
 endforeach (example ${examples})
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 499e255..c538ae8 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -17,6 +17,7 @@ add_test (
         dsetf5.h5
         f1img.h5
         f1tab.h5
+        f2tab.h5
         tstds.h5
 )
 
@@ -44,6 +45,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
           dsetf5.h5
           f1img.h5
           f1tab.h5
+          f2tab.h5
           tstds.h5
   )
   set_tests_properties (HL_FORTRAN_test-shared-clear-objects
-- 
cgit v0.12