build-script: allow to run host-side iOS tests

gribozavr · gribozavr · commit f731d4fecbe5 · 2016-02-05T13:50:24.000-08:00
This change allows to easily run iOS tests that require only running the
compiler, and don't require running the generated code.
diff --git a/docs/Testing.rst b/docs/Testing.rst
@@ -51,7 +51,7 @@ these targets in the build directory:
 
   Runs all tests.
 
-For day-to-day work on the Swift compiler, using check-swift should be
+For day-to-day work on the Swift compiler, using ``check-swift`` should be
 sufficient.  The buildbot runs validation tests, so if those are accidentally
 broken, it should not go unnoticed.
 
@@ -62,17 +62,21 @@ test suite.
 For every target above, there are variants for different optimizations:
 
 * the target itself (e.g., ``check-swift``) -- runs execution tests in
-  ``-Onone`` mode;
+  ``-Onone`` mode.
 
 * the target with ``-optimize`` suffix (e.g., ``check-swift-optimize``) -- runs
-  execution tests in ``-O`` mode; This target will only run tests marked as
+  execution tests in ``-O`` mode.  This target will only run tests marked as
   ``executable_test``.
 
 * the target with ``-optimize-unchecked`` suffix (e.g.,
   ``check-swift-optimize-unchecked``) -- runs execution tests in
   ``-Ounchecked`` mode. This target will only run tests marked as
   ``executable_test``.
 
+* the target with ``-non-executable`` suffix (e.g.,
+  ``check-swift-non-executable-iphoneos-arm64``) -- runs tests not marked with
+  ``executable_test`` in ``-Onone`` mode.
+
 If you need to manually run certain tests, you can invoke LLVM's lit.py script
 directly. For example::
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -115,7 +115,7 @@ if(PYTHONINTERP_FOUND)
     set(SWIFT_ASAN_BUILD TRUE)
   endif()
 
-  set(TEST_MODES optimize_none optimize optimize_unchecked)
+  set(TEST_MODES optimize_none optimize optimize_unchecked non_executable)
 
   foreach(SDK ${SWIFT_SDKS})
     foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
@@ -147,11 +147,15 @@ if(PYTHONINTERP_FOUND)
         if(NOT TEST_MODE STREQUAL "optimize_none")
           if(TEST_MODE STREQUAL "optimize")
             set(test_mode_target_suffix "-optimize")
-            list(APPEND LIT_ARGS "--param" "run_only_tests=executable_test")
+            list(APPEND LIT_ARGS "--param" "run_only_tests=executable_tests")
           endif()
           if(TEST_MODE STREQUAL "optimize_unchecked")
             set(test_mode_target_suffix "-optimize-unchecked")
-            list(APPEND LIT_ARGS "--param" "run_only_tests=executable_test")
+            list(APPEND LIT_ARGS "--param" "run_only_tests=executable_tests")
+          endif()
+          if(TEST_MODE STREQUAL "non_executable")
+            set(test_mode_target_suffix "-non-executable")
+            list(APPEND LIT_ARGS "--param" "run_only_tests=non_executable_tests")
           endif()
           list(APPEND LIT_ARGS "--param" "swift_test_mode=${TEST_MODE}")
         endif()
@@ -233,6 +237,9 @@ if(PYTHONINTERP_FOUND)
     if(TEST_MODE STREQUAL "optimize_unchecked")
       set(test_mode_target_suffix "-optimize-unchecked")
     endif()
+    if(TEST_MODE STREQUAL "non_executable")
+      set(test_mode_target_suffix "-non-executable")
+    endif()
 
     add_custom_target(check-swift${test_mode_target_suffix}
         DEPENDS "check-swift${test_mode_target_suffix}${SWIFT_PRIMARY_VARIANT_SUFFIX}")
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -396,16 +396,23 @@ elif swift_test_mode == 'optimize_unchecked':
     config.available_features.add("swift_test_mode_optimize_unchecked_" + run_cpu)
     config.available_features.add("swift_test_mode_optimize_unchecked")
     swift_execution_tests_extra_flags = '-Ounchecked'
+elif swift_test_mode == 'non_executable':
+    # No extra flags needed.
+    pass
 else:
     lit_config.fatal("Unknown test mode %r" % swift_test_mode)
 
 # Only run the subset of tests that require 'executable_test'?
 swift_run_only_tests = lit_config.params.get('run_only_tests', 'all')
-if swift_run_only_tests != 'all':
-  config.available_features.add("executable_test")
-  config.limit_to_features.add(swift_run_only_tests)
+if swift_run_only_tests == 'all':
+    config.available_features.add("executable_test")
+elif swift_run_only_tests == 'executable_tests':
+    config.available_features.add("executable_test")
+    config.limit_to_features.add(swift_run_only_tests)
+elif swift_run_only_tests == 'non_executable_tests':
+    pass
 else:
-  config.available_features.add("executable_test")
+    lit_config.fatal("Unknown test mode %r" % swift_run_only_tests)
 
 # Add substitutions for the run target triple, CPU, OS, and pointer size.
 config.substitutions.append(('%target-triple', config.variant_triple))
@@ -450,11 +457,48 @@ if run_vendor == 'apple':
         (config.variant_triple, stdlib_resource_dir_opt, mcp_opt))
     target_options_for_mock_sdk_after = sdk_overlay_dir_opt
 
-    if 'arm' in run_cpu:
+    if 'arm' in run_cpu and swift_test_mode != 'non_executable':
         raise RuntimeError('Device tests are not currently supported.')
 
+    if 'arm' in run_cpu:
+       # iOS/tvOS/watchOS device
+       if run_os == 'ios':
+           lit_config.note('Testing iOS ' + config.variant_triple)
+           xcrun_sdk_name = "iphoneos"
+       elif run_os == 'tvos':
+           lit_config.note('Testing AppleTV ' + config.variant_triple)
+           xcrun_sdk_name = "appletvos"
+       elif run_os == 'watchos':
+           lit_config.note('Testing watchOS ' + config.variant_triple)
+           xcrun_sdk_name = "watchos"
+
+       if run_cpu == "armv7" or run_cpu == "armv7k":
+           config.target_swiftmodule_name = "arm.swiftmodule"
+           config.target_swiftdoc_name = "arm.swiftdoc"
+       elif run_cpu == "arm64":
+           config.target_swiftmodule_name = "arm64.swiftmodule"
+           config.target_swiftdoc_name = "arm64.swiftdoc"
+       else:
+           lit_config.fatal("Unknown CPU '%s'" % run_cpu)
+
+       config.target_cc_options = (
+           "-arch %s -m%s-version-min=%s %s" %
+           (run_cpu, run_os, run_vers, clang_mcp_opt))
+
+       config.target_build_swift = (
+           "%s %s %s -F %s -Xlinker -rpath -Xlinker %s %s %s %s" %
+           (xcrun_prefix, config.swiftc, target_options,
+            extra_frameworks_dir,
+            "/tmp/swifttest-device/lib",
+            sdk_overlay_linker_opt, config.swift_test_options,
+            swift_execution_tests_extra_flags))
+       config.target_run = "unsupported"
+
+       (sw_vers_name, sw_vers_vers, sw_vers_build) = \
+            darwin_get_sdk_version(config.variant_sdk)
+
     elif run_os == 'ios' or run_os == 'tvos' or run_os == 'watchos':
-        # iOS/TVOS simulator
+        # iOS/tvOS/watchOS simulator
         if run_os == 'ios':
             lit_config.note("Testing iOS simulator " + config.variant_triple)
             xcrun_sdk_name = "iphonesimulator"
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -128,10 +128,13 @@ KNOWN_SETTINGS=(
     skip-test-osx               ""               "set to skip testing Swift stdlibs for OSX"
     skip-test-ios               ""               "set to skip testing Swift stdlibs for iOS"
     skip-test-ios-simulator     ""               "set to skip testing Swift stdlibs for iOS simulators (i.e. test devices only)"
+    skip-test-ios-host          ""               "set to skip testing the host parts of the iOS toolchain"
     skip-test-tvos              ""               "set to skip testing Swift stdlibs for tvOS"
     skip-test-tvos-simulator    ""               "set to skip testing Swift stdlibs for tvOS simulators (i.e. test devices only)"
+    skip-test-tvos-host         ""               "set to skip testing the host parts of the tvOS toolchain"
     skip-test-watchos           ""               "set to skip testing Swift stdlibs for Apple watchOS"
     skip-test-watchos-simulator  ""              "set to skip testing Swift stdlibs for Apple watchOS simulators (i.e. test devices only)"
+    skip-test-watchos-host      ""               "set to skip testing the host parts of the watchOS toolchain"
     skip-test-validation        ""               "set to skip validation test suite"
     skip-test-optimized         ""               "set to skip testing the test suite in optimized mode"
     stress-test-sourcekit       ""               "set to run the stress-SourceKit target"
@@ -544,6 +547,7 @@ if [[ "${SKIP_IOS}" ]] ; then
     SKIP_BUILD_IOS_DEVICE=1
     SKIP_BUILD_IOS_SIMULATOR=1
     SKIP_TEST_IOS=1
+    SKIP_TEST_IOS_HOST=1
     SKIP_TEST_IOS_SIMULATOR=1
 fi
 
@@ -552,6 +556,7 @@ if [[ "${SKIP_TVOS}" ]] ; then
     SKIP_BUILD_TVOS_DEVICE=1
     SKIP_BUILD_TVOS_SIMULATOR=1
     SKIP_TEST_TVOS=1
+    SKIP_TEST_TVOS_HOST=1
     SKIP_TEST_TVOS_SIMULATOR=1
 fi
 
@@ -560,6 +565,7 @@ if [[ "${SKIP_WATCHOS}" ]] ; then
     SKIP_BUILD_WATCHOS_DEVICE=1
     SKIP_BUILD_WATCHOS_SIMULATOR=1
     SKIP_TEST_WATCHOS=1
+    SKIP_TEST_WATCHOS_HOST=1
     SKIP_TEST_WATCHOS_SIMULATOR=1
 fi
 
@@ -568,6 +574,7 @@ if [[ "${SKIP_BUILD_IOS}" ]] ; then
     SKIP_BUILD_IOS_DEVICE=1
     SKIP_BUILD_IOS_SIMULATOR=1
     SKIP_TEST_IOS=1
+    SKIP_TEST_IOS_HOST=1
     SKIP_TEST_IOS_SIMULATOR=1
 fi
 
@@ -576,6 +583,7 @@ if [[ "${SKIP_BUILD_TVOS}" ]] ; then
     SKIP_BUILD_TVOS_DEVICE=1
     SKIP_BUILD_TVOS_SIMULATOR=1
     SKIP_TEST_TVOS=1
+    SKIP_TEST_TVOS_HOST=1
     SKIP_TEST_TVOS_SIMULATOR=1
 fi
 
@@ -584,6 +592,7 @@ if [[ "${SKIP_BUILD_WATCHOS}" ]] ; then
     SKIP_BUILD_WATCHOS_DEVICE=1
     SKIP_BUILD_WATCHOS_SIMULATOR=1
     SKIP_TEST_WATCHOS=1
+    SKIP_TEST_WATCHOS_HOST=1
     SKIP_TEST_WATCHOS_SIMULATOR=1
 fi
 
@@ -615,14 +624,17 @@ if [[ "${SKIP_BUILD_WATCHOS_SIMULATOR}" ]] ; then
 fi
 
 if [[ "${SKIP_TEST_IOS}" ]] ; then
+    SKIP_TEST_IOS_HOST=1
     SKIP_TEST_IOS_SIMULATOR=1
 fi
 
 if [[ "${SKIP_TEST_TVOS}" ]] ; then
+    SKIP_TEST_TVOS_HOST=1
     SKIP_TEST_TVOS_SIMULATOR=1
 fi
 
 if [[ "${SKIP_TEST_WATCHOS}" ]] ; then
+    SKIP_TEST_WATCHOS_HOST=1
     SKIP_TEST_WATCHOS_SIMULATOR=1
 fi
 
@@ -938,6 +950,7 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
     build_for_this_target=1
     perftest_this_target=
     test_this_target=1
+    test_host_only=
     case ${deployment_target} in
         linux-*)
             build_for_this_target=1
@@ -955,7 +968,11 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
         iphoneos-*)
             build_for_this_target=$(not ${SKIP_BUILD_IOS_DEVICE})
             perftest_this_target=$(not ${SKIP_BUILD_IOS_DEVICE})
-            test_this_target=
+            if [[ ! "${SKIP_TEST_IOS_HOST}" ]] ; then
+                test_host_only=1
+            else
+                test_this_target=
+            fi
             ;;
         iphonesimulator-*)
             build_for_this_target=$(not ${SKIP_BUILD_IOS_SIMULATOR})
@@ -964,7 +981,11 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
         appletvos-*)
             build_for_this_target=$(not ${SKIP_BUILD_TVOS_DEVICE})
             perftest_this_target=$(not ${SKIP_BUILD_TVOS_DEVICE})
-            test_this_target=
+            if [[ ! "${SKIP_TEST_TVOS_HOST}" ]] ; then
+                test_host_only=1
+            else
+                test_this_target=
+            fi
             ;;
         appletvsimulator-*)
             build_for_this_target=$(not ${SKIP_BUILD_TVOS_SIMULATOR})
@@ -973,7 +994,11 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
         watchos-*)
             build_for_this_target=$(not ${SKIP_BUILD_WATCHOS_DEVICE})
             perftest_this_target=$(not ${SKIP_BUILD_WATCHOS_DEVICE})
-            test_this_target=
+            if [[ ! "${SKIP_TEST_WATCHOS_HOST}" ]] ; then
+                test_host_only=1
+            else
+                test_this_target=
+            fi
             ;;
         watchsimulator-*)
             build_for_this_target=$(not ${SKIP_BUILD_WATCHOS_SIMULATOR})
@@ -993,17 +1018,20 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
             "${SWIFT_PERFTEST_TARGETS[@]}" "swift-perftest-${deployment_target}")
     fi
     if [[ "${test_this_target}" ]] ; then
+        if [[ -n "${test_host_only}" ]] ; then
+            test_target_suffix="-non-executable"
+        fi
         if [[ "${SKIP_TEST_VALIDATION}" ]] ; then
             SWIFT_TEST_TARGETS=(
-                "${SWIFT_TEST_TARGETS[@]}" "check-swift-${deployment_target}")
-            if [[ $(not ${SKIP_TEST_OPTIMIZED}) ]] ; then
+                "${SWIFT_TEST_TARGETS[@]}" "check-swift${test_target_suffix}-${deployment_target}")
+            if [[ $(not ${SKIP_TEST_OPTIMIZED}) && ! -n "${test_host_only}" ]] ; then
               SWIFT_TEST_TARGETS=(
                  "${SWIFT_TEST_TARGETS[@]}" "check-swift-optimize-${deployment_target}")
             fi
         else
             SWIFT_TEST_TARGETS=(
-                "${SWIFT_TEST_TARGETS[@]}" "check-swift-all-${deployment_target}")
-            if [[ $(not ${SKIP_TEST_OPTIMIZED}) ]] ; then
+                "${SWIFT_TEST_TARGETS[@]}" "check-swift-all${test_target_suffix}-${deployment_target}")
+            if [[ $(not ${SKIP_TEST_OPTIMIZED}) && ! -n "${test_host_only}" ]] ; then
               SWIFT_TEST_TARGETS=(
                  "${SWIFT_TEST_TARGETS[@]}" "check-swift-all-optimize-${deployment_target}")
             fi
