build: fully disable tests when their required dependencies are missing (#5005)

We previously merely *marked* tests as "broken" in this case, and
depended on ctest being launched with `-E broken` to ensure those were
skipped. Not everybody did. Let's just truly skip them.

Fixes #4979

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

Makefile

@@ -293,7 +293,7 @@ test: build
 	@ ${CMAKE} -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests ${TEST_FLAGS}..."
 	@ ( cd ${build_dir} ; \
 	    PYTHONPATH=${PWD}/${build_dir}/lib/python/site-packages \
-	    ctest -E broken ${TEST_FLAGS} \
+	    ctest ${TEST_FLAGS} \
 	  )
 	@ ( if [[ "${CODECOV}" == "1" ]] ; then \
 	      cd ${build_dir} ; \

src/cmake/testing.cmake

@@ -47,7 +47,7 @@ set(OIIO_TESTSUITE_IMAGEDIR "${PROJECT_BINARY_DIR}/testsuite" CACHE PATH
 #
 # The optional SUFFIX is appended to the test name.
 #
-# The optinonal ENVIRONMENT is a list of environment variables to set for the
+# The optional ENVIRONMENT is a list of environment variables to set for the
 # test.
 #
 macro (oiio_add_tests)
@@ -56,24 +56,29 @@ macro (oiio_add_tests)
     set (_ats_testdir "${OIIO_TESTSUITE_IMAGEDIR}/${_ats_IMAGEDIR}")
     # If there was a FOUNDVAR param specified and that variable name is
     # not defined, mark the test as broken.
+    set (_test_disabled FALSE)
+    set (_test_notfound FALSE)
     foreach (_var ${_ats_FOUNDVAR})
         if (NOT ${_var})
             set (_ats_LABEL "broken")
+            set (_test_notfound TRUE)
         endif ()
     endforeach ()
     set (_test_disabled 0)
     foreach (_var ${_ats_ENABLEVAR})
         if ((NOT "${${_var}}" STREQUAL "" AND NOT "${${_var}}") OR
             (NOT "$ENV{${_var}}" STREQUAL "" AND NOT "$ENV{${_var}}"))
             set (_ats_LABEL "broken")
-            set (_test_disabled 1)
+            set (_test_disabled TRUE)
         endif ()
     endforeach ()
     # For OCIO 2.2+, have the testsuite use the default built-in config
     list (APPEND _ats_ENVIRONMENT "OCIO=ocio://default"
                                   "OIIO_TESTSUITE_OCIOCONFIG=ocio://default")
     if (_test_disabled)
         message (STATUS "Skipping test(s) ${_ats_UNPARSED_ARGUMENTS} because of disabled ${_ats_ENABLEVAR}")
+    elseif (_test_notfound)
+        message (STATUS "Skipping test(s) ${_ats_UNPARSED_ARGUMENTS} because of missing dependency from ${_ats_FOUNDVAR}")
     elseif (_ats_IMAGEDIR AND NOT EXISTS ${_ats_testdir})
         # If the directory containing reference data (images) for the test
         # isn't found, point the user at the URL.