Tests: Rename VerifyHeaderSets tests to VerifyInterfaceHeaderSets

This is in preparation for adding tests that verify private header sets.

Tests/RunCMake/VerifyHeaderSets/RunCMakeTest.cmake

@@ -1,55 +1,57 @@
 include(RunCMake)
 
-function(run_cmake_build name target)
+function(run_cmake_build name verifyType target)
   if(NOT BUILD_CONFIG)
     set(BUILD_CONFIG Debug)
   endif()
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${name}-build)
   set(RunCMake_TEST_NO_CLEAN 1)
-  run_cmake_command(${name}-${target}-${BUILD_CONFIG}-build ${CMAKE_COMMAND} --build . --config ${BUILD_CONFIG} --target ${target})
+  run_cmake_command(${name}-${target}-${BUILD_CONFIG}-build
+    ${CMAKE_COMMAND} --build . --config ${BUILD_CONFIG} --target ${target}_verify_${verifyType}_header_sets
+  )
 endfunction()
 
 set(RunCMake_TEST_OPTIONS -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON)
 if(NOT RunCMake_GENERATOR_IS_MULTI_CONFIG)
   list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
 endif()
-run_cmake(VerifyHeaderSets)
+run_cmake(VerifyInterfaceHeaderSets)
 unset(RunCMake_TEST_OPTIONS)
 
-run_cmake_build(VerifyHeaderSets static_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets shared_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets object_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets interface_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets exe_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets export_exe_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets none_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets property_off_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets private_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets a_h_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets dir_c_h_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets dir_cxx_h_verify_interface_header_sets)
+run_cmake_build(VerifyInterfaceHeaderSets interface static)
+run_cmake_build(VerifyInterfaceHeaderSets interface shared)
+run_cmake_build(VerifyInterfaceHeaderSets interface object)
+run_cmake_build(VerifyInterfaceHeaderSets interface interface)
+run_cmake_build(VerifyInterfaceHeaderSets interface exe)
+run_cmake_build(VerifyInterfaceHeaderSets interface export_exe)
+run_cmake_build(VerifyInterfaceHeaderSets interface none)
+run_cmake_build(VerifyInterfaceHeaderSets interface property_off)
+run_cmake_build(VerifyInterfaceHeaderSets interface private)
+run_cmake_build(VerifyInterfaceHeaderSets interface a_h)
+run_cmake_build(VerifyInterfaceHeaderSets interface dir_c_h)
+run_cmake_build(VerifyInterfaceHeaderSets interface dir_cxx_h)
 
 if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
-  run_cmake_build(VerifyHeaderSets config_verify_interface_header_sets)
+  run_cmake_build(VerifyInterfaceHeaderSets interface config)
   if(RunCMake_GENERATOR_IS_MULTI_CONFIG)
     set(BUILD_CONFIG Release)
-    run_cmake_build(VerifyHeaderSets config_verify_interface_header_sets)
+    run_cmake_build(VerifyInterfaceHeaderSets interface config)
     unset(BUILD_CONFIG)
   endif()
 endif()
 
-run_cmake_build(VerifyHeaderSets lang_test_c_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets lang_test_cxx_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets interface_lang_test_cxx_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets list_verify_interface_header_sets)
-run_cmake_build(VerifyHeaderSets skip_linting_verify_interface_header_sets)
+run_cmake_build(VerifyInterfaceHeaderSets interface lang_test_c)
+run_cmake_build(VerifyInterfaceHeaderSets interface lang_test_cxx)
+run_cmake_build(VerifyInterfaceHeaderSets interface iface_lang_cxx)
+run_cmake_build(VerifyInterfaceHeaderSets interface list)
+run_cmake_build(VerifyInterfaceHeaderSets interface skip_linting)
 
 set(RunCMake_TEST_OPTIONS -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON)
 run_cmake(AllVerifyInterfaceHeaderSets)
 unset(RunCMake_TEST_OPTIONS)
 
-run_cmake_build(AllVerifyInterfaceHeaderSets all_verify_interface_header_sets)
+run_cmake_build(AllVerifyInterfaceHeaderSets interface all)
 
 set(RunCMake_TEST_OPTIONS -DCMAKE_VERIFY_INTERFACE_HEADER_SETS=ON)
-run_cmake(VerifyHeaderSetsNonexistent)
+run_cmake(VerifyInterfaceHeaderSetsNonexistent)
 unset(RunCMake_TEST_OPTIONS)

Tests/RunCMake/VerifyHeaderSets/VerifyInterfaceHeaderSets.cmake

@@ -61,9 +61,11 @@ add_library(lang_test_cxx STATIC lib.c lib.cxx)
 target_compile_definitions(lang_test_cxx INTERFACE EXPECT_CXX)
 target_sources(lang_test_cxx INTERFACE FILE_SET HEADERS FILES lang_test.h)
 
-add_library(interface_lang_test_cxx INTERFACE)
-target_compile_definitions(interface_lang_test_cxx INTERFACE EXPECT_CXX)
-target_sources(interface_lang_test_cxx INTERFACE FILE_SET HEADERS FILES lang_test.h)
+# Don't make the name of this target any longer or else it triggers a crash in the OpenWatcom compiler.
+# That crash only occurs when debug information is enabled, which is the case when this test runs.
+add_library(iface_lang_cxx INTERFACE)
+target_compile_definitions(iface_lang_cxx INTERFACE EXPECT_CXX)
+target_sources(iface_lang_cxx INTERFACE FILE_SET HEADERS FILES lang_test.h)
 
 set_property(SOURCE error.h PROPERTY LANGUAGE C)