Run non-executable Swift Runtime tests for x86_64 Android

Author: weliveindetail

test/lit.cfg

@@ -1891,9 +1891,11 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     config.target_pic_opt = "-fPIC"
 
     ndk_platform_tuple = get_architecture_value(armv7="armeabi-v7a",
-                                                aarch64="arm64-v8a")
+                                                aarch64="arm64-v8a",
+                                                x86_64="x86_64")
     ndk_platform_triple = get_architecture_value(armv7="arm-linux-androideabi",
-                                                 aarch64="aarch64-linux-android")
+                                                 aarch64="aarch64-linux-android",
+                                                 x86_64="x86_64-linux-android")
     if platform.system() == 'Linux':
         prebuilt_directory = 'linux-x86_64'
     elif platform.system() == 'Darwin':

utils/build.ps1

@@ -204,7 +204,7 @@ if ($AndroidSDKs.Length -gt 0) {
 
 if ($Test -contains "*") {
   # Explicitly don't include llbuild yet since tests are known to fail on Windows
-  $Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp")
+  $Test = @("lld", "lldb", "swift", "dispatch", "foundation", "xctest", "swift-format", "sourcekit-lsp", "android")
 }
 
 # Architecture definitions
@@ -2005,17 +2005,22 @@ function Build-CURL([Platform]$Platform, $Arch) {
     })
 }
 
-function Build-Runtime([Platform]$Platform, $Arch) {
+function Build-Runtime([Platform]$Platform, $Arch, [switch]$Test = $false) {
+  $Targets = @("install")
   $PlatformDefines = @{}
   if ($Platform -eq "Android") {
     $PlatformDefines += @{
       LLVM_ENABLE_LIBCXX = "YES";
       SWIFT_USE_LINKER = "lld";
-      SWIFT_INCLUDE_TESTS = "NO";
-      SWIFT_INCLUDE_TEST_BINARIES = "NO";
     }
   }
-
+  if ($Test) {
+    $Targets += @("check-swift-all-only_non_executable")
+    $PlatformDefines += @{
+      SWIFT_INCLUDE_TESTS = "YES";
+      SWIFT_BUILD_TEST_SUPPORT_MODULES = "YES";
+    }
+  }
 
   Isolate-EnvVars {
     $env:Path = "$(Get-CMarkBinaryCache $Arch)\src;$(Get-PinnedToolchainRuntime);${env:Path}"
@@ -2026,6 +2031,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
       Get-HostProjectBinaryCache Compilers
     }
 
+    $NativeToolsPath = Join-Path -Path $CompilersBinaryCache -ChildPath "bin"
     Build-CMakeProject `
       -Src $SourceCache\swift `
       -Bin (Get-TargetProjectBinaryCache $Arch Runtime) `
@@ -2034,6 +2040,7 @@ function Build-Runtime([Platform]$Platform, $Arch) {
       -Platform $Platform `
       -CacheScript $SourceCache\swift\cmake\caches\Runtime-$Platform-$($Arch.LLVMName).cmake `
       -UseBuiltCompilers C,CXX,Swift `
+      -BuildTargets $Targets `
       -Defines ($PlatformDefines + @{
         CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Arch);
         CMAKE_Swift_COMPILER_WORKS = "YES";
@@ -2047,7 +2054,8 @@ function Build-Runtime([Platform]$Platform, $Arch) {
         SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING = "YES";
         SWIFT_ENABLE_SYNCHRONIZATION = "YES";
         SWIFT_ENABLE_VOLATILE = "YES";
-        SWIFT_NATIVE_SWIFT_TOOLS_PATH = (Join-Path -Path $CompilersBinaryCache -ChildPath "bin");
+        SWIFT_NATIVE_LLVM_TOOLS_PATH = $NativeToolsPath;
+        SWIFT_NATIVE_SWIFT_TOOLS_PATH = $NativeToolsPath;
         SWIFT_PATH_TO_LIBDISPATCH_SOURCE = "$SourceCache\swift-corelibs-libdispatch";
         SWIFT_PATH_TO_STRING_PROCESSING_SOURCE = "$SourceCache\swift-experimental-string-processing";
         CMAKE_SHARED_LINKER_FLAGS = if ($Platform -eq "Windows") { @("/INCREMENTAL:NO", "/OPT:REF", "/OPT:ICF") } else { @() };
@@ -3222,6 +3230,11 @@ if (-not $IsCrossCompiling) {
     Build-Compilers $HostArch @Tests
   }
 
+  if ($Test -contains "android") {
+    Build-Runtime Android $AndroidX64 -Test
+    Build-Runtime Android $AndroidARM64 -Test
+  }
+
   if ($Test -contains "dispatch") {
     Build-Dispatch Windows $HostArch -Test
   }