From fd3ecb1d94e5ff087b632e2b089fb7fca49de9ef Mon Sep 17 00:00:00 2001
From: Brian Gesiak <modocache@gmail.com>
Date: Tue, 7 Jun 2016 15:59:51 -0400
Subject: [PATCH] [test] Prepare tests to run on Android

- Expand operating system checks such that Glibc is properly
  imported on Android.
- For tests that are unsupported on platforms that normally
  do not support an Objective-C runtime, expand the unsupported
  checks to include Android.
- Pass the `-sdk` parameter when invoking `%target-sil-opt`.
- Expect failures when testing semaphores, which are not included
  in Android Bionic.
---
 test/1_stdlib/POSIX.swift                   | 4 ++++
 test/1_stdlib/tgmath.swift                  | 2 +-
 test/ClangModules/autolinking.swift         | 1 +
 test/Serialization/autolinking.swift        | 1 +
 validation-test/SIL/verify_all_overlays.sil | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/1_stdlib/POSIX.swift b/test/1_stdlib/POSIX.swift
index d53502ca5c865..679c03a092989 100644
--- a/test/1_stdlib/POSIX.swift
+++ b/test/1_stdlib/POSIX.swift
@@ -1,6 +1,10 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
+// Android Bionic does not provide a working implementation of
+// <semaphore.h>.
+// XFAIL: OS=linux-androideabi
+
 import StdlibUnittest
 #if os(Linux)
   import Glibc
diff --git a/test/1_stdlib/tgmath.swift b/test/1_stdlib/tgmath.swift
index 6353dd8174065..55fac978faabb 100644
--- a/test/1_stdlib/tgmath.swift
+++ b/test/1_stdlib/tgmath.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
-#if os(Linux) || os(FreeBSD)
+#if os(Linux) || os(FreeBSD) || os(Android)
   import Glibc
   // FIXME: this is a quick hack for non Darwin platforms
   // where they doesn't have CoreGraphics module.
diff --git a/test/ClangModules/autolinking.swift b/test/ClangModules/autolinking.swift
index 3ceec2cf31182..ba9e8a531e971 100644
--- a/test/ClangModules/autolinking.swift
+++ b/test/ClangModules/autolinking.swift
@@ -16,6 +16,7 @@
 // UNSUPPORTED: OS=linux-gnu
 // UNSUPPORTED: OS=linux-gnueabihf
 // UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 import LinkMusket
 import LinkFramework
diff --git a/test/Serialization/autolinking.swift b/test/Serialization/autolinking.swift
index cb412dc28f082..8a67b8fc9bee5 100644
--- a/test/Serialization/autolinking.swift
+++ b/test/Serialization/autolinking.swift
@@ -25,6 +25,7 @@
 // UNSUPPORTED: OS=linux-gnu
 // UNSUPPORTED: OS=linux-gnueabihf
 // UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 import someModule
 
diff --git a/validation-test/SIL/verify_all_overlays.sil b/validation-test/SIL/verify_all_overlays.sil
index 0bb5a6b520bc2..caa86c6fb1474 100644
--- a/validation-test/SIL/verify_all_overlays.sil
+++ b/validation-test/SIL/verify_all_overlays.sil
@@ -1,4 +1,4 @@
-// RUN: for x in %platform-sdk-overlay-dir/*.swiftmodule; do [[ $(basename "$x") = Swift.swiftmodule ]] && continue; llvm-bcanalyzer $x | FileCheck %s; %target-sil-opt -enable-sil-verify-all $x > /dev/null; done
+// RUN: for x in %platform-sdk-overlay-dir/*.swiftmodule; do [[ $(basename "$x") = Swift.swiftmodule ]] && continue; llvm-bcanalyzer $x | FileCheck %s; %target-sil-opt -sdk %sdk -enable-sil-verify-all $x > /dev/null; done
 
 // CHECK-NOT: Unknown