fixup! Add an option to disable QEMU testing

Author: dcandler

CMakeLists.txt

@@ -152,12 +152,12 @@ option(
 )
 option(
     ENABLE_QEMU_TESTING
-    "Tests using QEMU are enabled by default, but can be disabled."
+    "Enable tests that use QEMU. This option is ON by default."
     ON
 )
 option(
     ENABLE_FVP_TESTING
-    "Tests using FVP need to be explictly enabled."
+    "Enable tests that use FVPs. This option is OFF by default."
 )
 set(
     FVP_INSTALL_DIR

arm-multilib/CMakeLists.txt

@@ -35,12 +35,12 @@ set(LLVM_BINARY_DIR "" CACHE PATH "Path to LLVM toolchain build or install root.
 set(LIBC_HDRGEN "" CACHE PATH "Path to prebuilt lbc-hdrgen if not included in LLVM binaries set by LLVM_BINARY_DIR")
 option(
     ENABLE_QEMU_TESTING
-    "Tests using QEMU are enabled by default, but can be disabled."
+    "Enable tests that use QEMU. This option is ON by default."
     ON
 )
 option(
     ENABLE_FVP_TESTING
-    "Tests using FVP need to be explictly enabled."
+    "Enable tests that use FVPs. This option is OFF by default."
 )
 set(
     FVP_INSTALL_DIR
@@ -167,8 +167,8 @@ foreach(lib_idx RANGE ${lib_count_dec})
             file(READ ${variant_json_file} variant_json_str)
             string(JSON test_executor GET ${variant_json_str} "args" "common" "TEST_EXECUTOR")
 
-            # FVP testing should default to off, so override any 
-            # settings from the JSON.
+            # The multilib project can be configured to disable QEMU and/or FVP
+            # testing, which will need to override the settings from the json.
             if((test_executor STREQUAL "qemu" AND NOT ${ENABLE_QEMU_TESTING}) OR (test_executor STREQUAL "fvp" AND NOT ${ENABLE_FVP_TESTING}))
                 list(APPEND additional_cmake_args "-DENABLE_LIBC_TESTS=OFF" "-DENABLE_COMPILER_RT_TESTS=OFF" "-DENABLE_LIBCXX_TESTS=OFF")
                 set(read_ENABLE_LIBC_TESTS "OFF")