5 files changed, 20 insertions, 1 deletions
diff --git a/hl/c++/examples/ptExampleFL.cpp b/hl/c++/examples/ptExampleFL.cpp
index 0e280f0..cb407e2 100644
--- a/hl/c++/examples/ptExampleFL.cpp
+++ b/hl/c++/examples/ptExampleFL.cpp
@@ -72,7 +72,7 @@ main(void)
     if (err < 0)
         fprintf(stderr, "Error getting packet count.");
 
-    printf("Number of packets in packet table after five appends: %llu\n", count);
+    printf("Number of packets in packet table after five appends: %" PRIuHSIZE "\n", count);
 
     /* Initialize packet table's "current record" */
     ptable.ResetIndex();
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 4137270..b07dd6d 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -44,6 +44,9 @@ else ()
   )
 endif ()
 set_tests_properties (HL_CPP_ptableTest PROPERTIES DEPENDS HL_CPP_ptableTest-clear-objects)
+if ("HL_CPP_ptableTest" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+  set_tests_properties (HL_CPP_ptableTest PROPERTIES DISABLED true)
+endif ()
 add_test (
     NAME HL_CPP_ptableTest-clean-objects
     COMMAND    ${CMAKE_COMMAND}
@@ -53,3 +56,4 @@ set_tests_properties (HL_CPP_ptableTest-clean-objects PROPERTIES
     DEPENDS HL_CPP_ptableTest
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 )
+
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 209186b..8421872 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -68,6 +68,9 @@ macro (ADD_H5_FORTRAN_TEST file)
       FIXTURES_REQUIRED clear_HL_FORTRAN_test
       WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
   )
+  if ("HL_FORTRAN_f90_${file}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+    set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DISABLED true)
+  endif ()
 endmacro ()
 
 foreach (h5_test ${H5_TESTS})
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index 781ed14..6ec5f29 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -118,6 +118,9 @@ macro (HL_ADD_TEST hl_name)
       ENVIRONMENT "srcdir=${HDF5_HL_TEST_BINARY_DIR}"
       WORKING_DIRECTORY ${HDF5_HL_TEST_BINARY_DIR}
   )
+  if ("HL_${hl_name}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+    set_tests_properties (HL_${hl_name} PROPERTIES DISABLED true)
+  endif ()
 endmacro ()
 
 HL_add_test (test_lite )
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake
index 7c1a7f5..aa4c41a 100644
--- a/hl/tools/h5watch/CMakeTests.cmake
+++ b/hl/tools/h5watch/CMakeTests.cmake
@@ -86,6 +86,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
           DEPENDS ${last_test}
           FIXTURES_REQUIRED gen_test_watch
       )
+      if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+        set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true)
+      endif ()
       set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
     endif ()
   endmacro ()
@@ -109,6 +112,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
           DEPENDS ${last_test}
           FIXTURES_REQUIRED gen_test_watch
       )
+      if ("H5WATCH_ARGS-h5watch-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+        set_tests_properties (H5WATCH_ARGS-h5watch-${resultfile} PROPERTIES DISABLED true)
+      endif ()
       set (last_test "H5WATCH_ARGS-h5watch-${resultfile}")
     endif ()
   endmacro ()
@@ -131,6 +137,9 @@ add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tes
           DEPENDS ${last_test}
           FIXTURES_REQUIRED gen_test_watch
       )
+      if ("H5WATCH-${resultfile}" MATCHES "${HDF5_DISABLE_TESTS_REGEX}")
+        set_tests_properties (H5WATCH-${resultfile} PROPERTIES DISABLED true)
+      endif ()
       set (last_test "H5WATCH-${resultfile}")
     endif ()
   endmacro ()