---

yaml
---
r: 318842
b: refs/heads/master-rebranch
c: 5df027b
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 7b8873f3b4addaa3707c77955b85f88b8230c287
+refs/heads/master-rebranch: 5df027b8ca2611fe121be4b70e7e02cd41436fb9

branches/master-rebranch/test/CMakeLists.txt

@@ -305,10 +305,15 @@ foreach(SDK ${SWIFT_SDKS})
           set(test_mode_target_suffix "-${test_mode}")
         endif()
 
+        set(maybe_command_upload_stdlib)
+        if(NOT test_mode STREQUAL "only_non_executable")
+          set(maybe_command_upload_stdlib ${command_upload_stdlib})
+        endif()
+
         set(test_target_name
             "check-swift${test_subset_target_suffix}${test_mode_target_suffix}${VARIANT_SUFFIX}")
         add_custom_target("${test_target_name}"
-            ${command_upload_stdlib}
+            ${maybe_command_upload_stdlib}
             ${command_upload_swift_reflection_test}
             ${command_clean_test_results_dir}
             COMMAND

branches/master-rebranch/test/lit.cfg

@@ -946,7 +946,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     def get_architecture_value(**kwargs):
         result = kwargs[run_cpu]
         if result is None:
-          if run_cpu == "armv7s" or run_cpu == "armv7k":
+          if run_cpu.startswith("armv7"):
             result = kwargs["armv7"]
           elif run_cpu == "arm64":
             result = kwards["aarch64"]
@@ -957,9 +957,22 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     ndk_platform_triple = get_architecture_value(armv7="arm-linux-androideabi",
                                                  aarch64="aarch64-linux-android")
     toolchain_directory_name = "{}-{}".format(ndk_platform_triple, config.android_ndk_gcc_version)
-    tools_directory = make_path(config.android_ndk_path, "toolchains",
-        toolchain_directory_name, "prebuilt", "linux-x86_64",
-        ndk_platform_triple, "bin")
+    if platform.system() == 'Linux':
+        prebuilt_directory = 'linux-x86_64'
+    elif platform.system() == 'Darwin':
+        prebuilt_directory = 'darwin-x86_64'
+    elif platform.system() == 'Windows':
+        # TODO: NDK distributes for Windows 32 and 64 bits. platform.machine()
+        # should allow us to find out the word size, but I don't have a
+        # machine to test right now. I think the values are AMD64 and x86, but
+        # I'm not sure. Everybody gets the 64 bits version for now.
+        prebuilt_directory = 'windows-x86_64'
+
+    toolchain_directory = make_path(
+        config.android_ndk_path, "toolchains", toolchain_directory_name,
+        "prebuilt", prebuilt_directory)
+    tools_directory = pipes.quote(make_path(
+        toolchain_directory, ndk_platform_triple, "bin"))
     lit_config.note("Testing Android " + config.variant_triple)
     config.target_object_format = "elf"
     config.target_shared_library_prefix = 'lib'
@@ -971,69 +984,85 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     config.target_runtime = "native"
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
     config.target_sdk_name = "android"
-    android_link_paths_opt = "-L {libcxx} -L {libgcc}".format(
-        libcxx=make_path(config.android_ndk_path,
-                         "sources", "cxx-stl", "llvm-libc++", "libs", ndk_platform_tuple),
-        libgcc=make_path(config.android_ndk_path,
-                         "toolchains", toolchain_directory_name, "prebuilt",
-                         "linux-x86_64", "lib", "gcc", ndk_platform_triple,
-                         "{}.x".format(config.android_ndk_gcc_version)))
+    android_link_paths_opt = "-L {} -L {} -L {}".format(
+        pipes.quote(make_path(
+            config.android_ndk_path, "sources", "cxx-stl", "llvm-libc++",
+            "libs", ndk_platform_tuple)),
+        pipes.quote(make_path(
+            toolchain_directory, "lib", "gcc", ndk_platform_triple,
+            "{}.x".format(config.android_ndk_gcc_version))),
+        pipes.quote(make_path(
+            toolchain_directory, ndk_platform_triple, "lib")))
     # Since NDK r14 the headers are unified under $NDK_PATH/sysroot, so the -sdk
     # switch is not enough. Additionally we have to include both the unified
     # sysroot, and the architecture sysroot.
-    android_include_paths_opt = "-I {sysroot} -I {sysroot_arch}".format(
-        sysroot=make_path(config.android_ndk_path, "sysroot", "usr", "include"),
-        sysroot_arch=make_path(config.android_ndk_path, "sysroot", "usr",
-                              "include", ndk_platform_triple))
-    config.target_build_swift = (
-        '%s -target %s -sdk %r -tools-directory %r %s %s '
-        '-use-ld=%s %s %s %s %s %s'
-        % (config.swiftc,
-           config.variant_triple, config.variant_sdk,
-           tools_directory, android_include_paths_opt, android_link_paths_opt,
-           config.android_linker_name,
-           resource_dir_opt, mcp_opt, config.swift_test_options,
-           config.swift_driver_test_options, swift_execution_tests_extra_flags))
+    unified_android_include_path = pipes.quote(make_path(
+        config.android_ndk_path, "sysroot", "usr", "include"))
+    architecture_android_include_path = pipes.quote(make_path(
+        config.android_ndk_path, "sysroot", "usr", "include",
+        ndk_platform_triple))
+    android_include_paths_opt = "-I {} -I {}".format(
+        unified_android_include_path, architecture_android_include_path)
+    # clang can use -isystem, but Swift cannot.
+    android_include_system_paths_opt = "-isystem {} -isystem {}".format(
+        unified_android_include_path, architecture_android_include_path)
+    config.target_build_swift = ' '.join([
+        config.swiftc,
+        '-target', config.variant_triple,
+        '-sdk', config.variant_sdk,
+        '-tools-directory', tools_directory,
+        android_include_paths_opt, android_link_paths_opt,
+        '-use-ld=%s' % config.android_linker_name,
+        resource_dir_opt, mcp_opt, config.swift_test_options,
+        config.swift_driver_test_options, swift_execution_tests_extra_flags])
     config.target_codesign = "echo"
-    config.target_build_swift_dylib = (
-        "%s -parse-as-library -emit-library -o '\\1'"
-        % (config.target_build_swift))
+    config.target_build_swift_dylib = ' '.join([
+        config.target_build_swift,
+        '-parse-as-library', '-emit-library',
+        '-o', "'\\1'"])
     config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
-    config.target_swift_frontend = (
-        '%s -frontend -target %s -sdk %r %s %s %s %s %s %s'
-        % (config.swift, config.variant_triple, config.variant_sdk,
-           android_include_paths_opt, android_link_paths_opt, resource_dir_opt,
-           mcp_opt, config.swift_test_options,
-           config.swift_frontend_test_options))
+    config.target_swift_frontend = ' '.join([
+        config.swift,
+        '-frontend',
+        '-target', config.variant_triple,
+        '-sdk', config.variant_sdk,
+        android_include_paths_opt, android_link_paths_opt,
+        resource_dir_opt, mcp_opt, config.swift_test_options,
+        config.swift_frontend_test_options])
     subst_target_swift_frontend_mock_sdk = config.target_swift_frontend
     subst_target_swift_frontend_mock_sdk_after = ""
     config.target_run = make_path(config.swift_src_root, 'utils', 'android', 'adb_test_runner.py')
     # FIXME: Include -sdk in this invocation.
-    config.target_sil_opt = (
-        '%s -target %s %s %s %s' %
-        (config.sil_opt, config.variant_triple, resource_dir_opt, mcp_opt, config.sil_test_options))
-    config.target_swift_ide_test = (
-        '%s -target %s %s %s %s' %
-        (config.swift_ide_test, config.variant_triple, resource_dir_opt,
-         mcp_opt, ccp_opt))
+    config.target_sil_opt = ' '.join([
+        config.sil_opt,
+        '-target', config.variant_triple,
+        resource_dir_opt, mcp_opt, config.sil_test_options])
+    config.target_swift_ide_test = ' '.join([
+        config.swift_ide_test,
+        '-target', config.variant_triple,
+        resource_dir_opt, mcp_opt, ccp_opt])
     subst_target_swift_ide_test_mock_sdk = config.target_swift_ide_test
     subst_target_swift_ide_test_mock_sdk_after = ""
-    config.target_swiftc_driver = (
-        "%s -target %s -sdk %r -tools-directory %s %s %s %s -use-ld=%s" %
-        (config.swiftc, config.variant_triple, config.variant_sdk,
-         tools_directory, android_link_paths_opt, resource_dir_opt, mcp_opt,
-         config.android_linker_name))
-    config.target_swift_modulewrap = (
-        '%s -modulewrap -target %s' %
-        (config.swiftc, config.variant_triple))
-    config.target_clang = (
-        "clang++ -target %s %s %s" %
-        (config.variant_triple, clang_mcp_opt, android_include_paths_opt))
-    config.target_ld = "{} -L{}".format(
+    config.target_swiftc_driver = ' '.join([
+        config.swiftc,
+        '-target', config.variant_triple,
+        '-sdk', config.variant_sdk,
+        '-tools-directory', tools_directory,
+        android_link_paths_opt, resource_dir_opt, mcp_opt,
+        '-use-ld=%s' % config.android_linker_name])
+    config.target_swift_modulewrap = ' '.join([
+        config.swiftc, '-modulewrap',
+        '-target', config.variant_triple])
+    config.target_clang = ' '.join([
+        'clang++',
+        '-target', config.variant_triple,
+        clang_mcp_opt, android_include_system_paths_opt])
+    config.target_ld = ' '.join([
         tools_directory,
-        make_path(test_resource_dir, config.target_sdk_name))
+        '-L%s' % make_path(test_resource_dir, config.target_sdk_name)])
     # The Swift interpreter is not available when targeting Android.
-    config.available_features.remove('swift_interpreter')
+    if 'swift_interpreter' in config.available_features:
+        config.available_features.remove('swift_interpreter')
 
 else:
     lit_config.fatal("Don't know how to define target_run and "

branches/master-rebranch/utils/build-presets.ini

@@ -804,6 +804,8 @@ mixin-preset=
 [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
 mixin-preset=buildbot_linux
 
+host-test
+
 release
 assertions
 extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
@@ -819,6 +821,8 @@ android-icu-i18n=%(arm_dir)s/libicui18nswift.so
 android-icu-i18n-include=%(arm_dir)s/icu/source/i18n
 android-icu-data=%(arm_dir)s/libicudataswift.so
 
+skip-test-linux
+
 [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,aarch64]
 mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build
 

branches/master-rebranch/utils/build-script

@@ -137,15 +137,10 @@ class HostSpecificConfiguration(object):
             # For platforms which normally require a connected device to
             # test, the default behavior is to run tests that only require
             # the host (i.e., they do not attempt to execute).
-            if deployment_platform.is_darwin and \
-               deployment_platform.is_embedded and \
-               not deployment_platform.is_simulator:
-                if deployment_platform not in \
-                        invocation.platforms_to_skip_test_host:
-                    test_host_only = True
-                    test = True
-                else:
-                    test = False
+            if deployment_platform.uses_host_tests and \
+                    deployment_platform not in \
+                    invocation.platforms_to_skip_test_host:
+                test_host_only = True
 
             name = deployment_target.name
 
@@ -181,7 +176,7 @@ class HostSpecificConfiguration(object):
                         "check-swift-benchmark-{}-external".format(name))
             if test:
                 if test_host_only:
-                    suffix = "-non-executable"
+                    suffix = "-only_non_executable"
                 else:
                     suffix = ""
                 subset_suffix = ""
@@ -407,11 +402,13 @@ class BuildScriptInvocation(object):
         if not args.test_watchos_simulator:
             self.platforms_to_skip_test.add(
                 StdlibDeploymentTarget.AppleWatchSimulator)
-
-        if not args.test_android_host:
+        if not args.test_android:
             self.platforms_to_skip_test.add(StdlibDeploymentTarget.Android)
 
         self.platforms_to_skip_test_host = set()
+        if not args.test_android_host:
+            self.platforms_to_skip_test_host.add(
+                StdlibDeploymentTarget.Android)
         if not args.test_ios_host:
             self.platforms_to_skip_test_host.add(StdlibDeploymentTarget.iOS)
         if not args.test_tvos_host:
@@ -709,6 +706,8 @@ class BuildScriptInvocation(object):
             impl_args += ["--skip-test-watchos-host"]
         if not args.test_watchos_simulator:
             impl_args += ["--skip-test-watchos-simulator"]
+        if not args.test_android:
+            impl_args += ["--skip-test-android"]
         if not args.test_android_host:
             impl_args += ["--skip-test-android-host"]
         if args.build_runtime_with_host_compiler:

branches/master-rebranch/utils/build-script-impl

@@ -166,6 +166,7 @@ KNOWN_SETTINGS=(
     skip-test-tvos-host         ""               "set to skip testing the host parts of the tvOS toolchain"
     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-android           ""               "set to skip testing Swift stdlibs for Android"
     skip-test-android-host      ""               "set to skip testing the host parts of the Android toolchain"
     validation-test             "0"              "set to run the validation test suite"
     long-test                   "0"              "set to run the long test suite"
@@ -1435,7 +1436,11 @@ function calculate_targets_for_host() {
             android-*)
                 swift_sdk="ANDROID"
                 build_for_this_target=$(not ${SKIP_BUILD_ANDROID})
-                test_this_target=$(not ${SKIP_TEST_ANDROID_HOST})
+                if [[ ! "${SKIP_TEST_ANDROID_HOST}" ]] ; then
+                    test_host_only=1
+                else
+                    test_this_target=$(not ${SKIP_TEST_ANDROID})
+                fi
                 ;;
             *)
                 echo "Unknown compiler deployment target: ${stdlib_deployment_target}"
@@ -1476,7 +1481,7 @@ function calculate_targets_for_host() {
         if [[ "${test_this_target}" ]] && [[ "${is_in_build_list}" ]]; then
             test_target_suffix=""
             if [[ -n "${test_host_only}" ]] ; then
-                test_target_suffix="-non-executable"
+                test_target_suffix="-only_non_executable"
             fi
 
             test_subset_target_suffix=""

branches/master-rebranch/utils/build_swift/driver_arguments.py

@@ -202,6 +202,7 @@ def _apply_default_arguments(args):
         args.test_ios = False
         args.test_tvos = False
         args.test_watchos = False
+        args.test_android = False
         args.test_indexstoredb = False
         args.test_sourcekitlsp = False
 
@@ -237,6 +238,10 @@ def _apply_default_arguments(args):
         args.test_watchos_simulator = False
 
     if not args.build_android:
+        args.test_android = False
+        args.test_android_host = False
+
+    if not args.test_android:
         args.test_android_host = False
 
     if not args.host_test:
@@ -899,6 +904,9 @@ def create_argument_parser():
            help='skip testing watchOS device targets on the host machine (the '
                 'watch itself)')
 
+    option('--skip-test-android',
+           toggle_false('test_android'),
+           help='skip testing all Android targets.')
     option('--skip-test-android-host',
            toggle_false('test_android_host'),
            help='skip testing Android device targets on the host machine (the '

branches/master-rebranch/utils/build_swift/tests/expected_options.py

@@ -174,6 +174,7 @@
     'swift_user_visible_version': defaults.SWIFT_USER_VISIBLE_VERSION,
     'symbols_package': None,
     'test': None,
+    'test_android': False,
     'test_android_host': False,
     'test_cygwin': False,
     'test_freebsd': False,
@@ -479,6 +480,7 @@ class IgnoreOption(_BaseOption):
                   dest='build_watchos_device'),
     DisableOption('--skip-build-watchos-simulator',
                   dest='build_watchos_simulator'),
+    DisableOption('--skip-test-android', dest='test_android'),
     DisableOption('--skip-test-android-host', dest='test_android_host'),
     DisableOption('--skip-test-cygwin', dest='test_cygwin'),
     DisableOption('--skip-test-freebsd', dest='test_freebsd'),

branches/master-rebranch/utils/run-test

@@ -202,7 +202,8 @@ def main():
         upload_stdlib_targets = []
         need_validation = any('/validation-test-' in path for path in paths)
         for target in targets:
-            upload_stdlib_targets += ["upload-stdlib-%s" % target]
+            if args.mode != 'only_non_executable':
+                upload_stdlib_targets += ["upload-stdlib-%s" % target]
             if need_validation:
                 dependency_targets += ["swift-stdlib-%s" % target]
             else: