From 38741f39285e8f370857e74aef46fedaba85a38d Mon Sep 17 00:00:00 2001 From: Brian Gesiak Date: Mon, 25 Apr 2016 10:54:22 -0400 Subject: [PATCH] [test] Add Android (and FreeBSD) to OS checks Add Android to the OS checks used to determine whether to import Glibc. These tests would pass on Android were it not for the fact that Android is not included in the Glibc check. Also add FreeBSD where missing. --- test/1_stdlib/PrintFloat.swift | 2 +- test/Prototypes/FloatingPoint.swift | 2 +- validation-test/StdlibUnittest/Stdin.swift | 2 +- validation-test/stdlib/String.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/1_stdlib/PrintFloat.swift b/test/1_stdlib/PrintFloat.swift index 6b0f472466c5b..7650c393457b0 100644 --- a/test/1_stdlib/PrintFloat.swift +++ b/test/1_stdlib/PrintFloat.swift @@ -6,7 +6,7 @@ // REQUIRES: executable_test import StdlibUnittest -#if os(Linux) || os(FreeBSD) +#if os(Linux) || os(FreeBSD) || os(Android) import Glibc #else import Darwin diff --git a/test/Prototypes/FloatingPoint.swift b/test/Prototypes/FloatingPoint.swift index fb6653f2532c3..2ca7feb866b3d 100644 --- a/test/Prototypes/FloatingPoint.swift +++ b/test/Prototypes/FloatingPoint.swift @@ -27,7 +27,7 @@ extension UInt32 : FloatingPointRepresentation { // Ewwww? #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS) import Darwin -#elseif os(Linux) +#elseif os(Linux) || os(FreeBSD) || os(Android) import Glibc #endif diff --git a/validation-test/StdlibUnittest/Stdin.swift b/validation-test/StdlibUnittest/Stdin.swift index 069fcebe8e905..272ce5ce0ebb0 100644 --- a/validation-test/StdlibUnittest/Stdin.swift +++ b/validation-test/StdlibUnittest/Stdin.swift @@ -6,7 +6,7 @@ import StdlibUnittest #if os(OSX) || os(iOS) || os(tvOS) || os(watchOS) import Darwin -#elseif os(Linux) +#elseif os(Linux) || os(FreeBSD) || os(Android) import Glibc #endif diff --git a/validation-test/stdlib/String.swift b/validation-test/stdlib/String.swift index 4b1f1581f0dc0..b09af94bf714f 100644 --- a/validation-test/stdlib/String.swift +++ b/validation-test/stdlib/String.swift @@ -919,7 +919,7 @@ StringTests.test( #endif } -#if os(Linux) +#if os(Linux) || os(FreeBSD) || os(Android) import Glibc #endif