Skip to content

[WebAssembly] Fix a few tests for WASI #29871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/stdlib/FloatConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#elseif os(Windows)
import MSVCRT
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/MathConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#elseif os(Windows)
import MSVCRT
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/POSIX.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import StdlibUnittest
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#else
#error("Unsupported platform")
Expand Down
4 changes: 2 additions & 2 deletions test/stdlib/PrintPointer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ PrintTests.test("Printable") {
let lowUP = UnsafeMutablePointer<Float>(bitPattern: 0x1)!
let fourByteUP = UnsafeMutablePointer<Float>(bitPattern: 0xabcd1234 as UInt)!

#if !(arch(i386) || arch(arm))
#if !(arch(i386) || arch(arm) || arch(wasm32))
let eightByteAddr: UInt = 0xabcddcba12344321
let eightByteUP = UnsafeMutablePointer<Float>(bitPattern: eightByteAddr)!
#endif

#if arch(i386) || arch(arm)
#if arch(i386) || arch(arm) || arch(wasm32)
let expectedLow = "0x00000001"
expectPrinted("0xabcd1234", fourByteUP)
#else
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/Runtime.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import SwiftShims

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#elseif os(Windows)
import MSVCRT
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/VarArgs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Swift
#if _runtime(_ObjC)
import Darwin
import CoreGraphics
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
typealias CGFloat = Double
#elseif os(Windows)
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/tgmath.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin.C.tgmath
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#elseif os(Windows)
import MSVCRT
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/tgmath_optimized.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
import Glibc
#elseif os(Windows)
import MSVCRT
Expand Down