Skip to content

Commit 0d56b37

Browse files
compnerdcompnerd
authored
Merge pull request #30599 from 3405691582/OpenBSD_Port_Testing
[test] Setup testing for OpenBSD.
2 parents b7bc7bc + 4a36a4b commit 0d56b37

20 files changed

+27
-21
lines changed

‎test/ClangImporter/availability_returns_twice.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
88
import Darwin
99
typealias JumpBuffer = Int32
10-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
10+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1111
import Glibc
1212
typealias JumpBuffer = jmp_buf
1313
#else

‎test/ClangImporter/clang_builtins.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
44
import Darwin
5-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
5+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
66
import Glibc
77
#elseif os(Windows)
88
import MSVCRT

‎test/Fuzzing/fuzzer_test.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1212
import Darwin
13-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
13+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1414
import Glibc
1515
#elseif os(Windows)
1616
import MSVCRT

‎test/Fuzzing/fuzzer_test_simpler.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1212
import Darwin
13-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
13+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1414
import Glibc
1515
#elseif os(Windows)
1616
import MSVCRT

‎test/IRGen/builtin_math.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
44
import Darwin
5-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
5+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
66
import Glibc
77
#elseif os(Windows)
88
import MSVCRT

‎test/Interpreter/SDK/libc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1313
import Darwin
14-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
14+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1515
import Glibc
1616
#elseif os(Windows)
1717
import MSVCRT

‎test/Interpreter/dynamicReplacement_property_observer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1515
import Darwin
16-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
16+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1717
import Glibc
1818
#elseif os(Windows)
1919
import MSVCRT

‎test/Interpreter/dynamic_replacement.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import StdlibUnittest
5555

5656
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
5757
import Darwin
58-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
58+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
5959
import Glibc
6060
#elseif os(Windows)
6161
import MSVCRT

‎test/Interpreter/dynamic_replacement_chaining.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import StdlibUnittest
2727

2828
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
2929
import Darwin
30-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
30+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
3131
import Glibc
3232
#elseif os(Windows)
3333
import MSVCRT

‎test/Interpreter/dynamic_replacement_without_previous_calls.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import StdlibUnittest
1313

1414
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1515
import Darwin
16-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
16+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1717
import Glibc
1818
#elseif os(Windows)
1919
import MSVCRT

‎test/Prototypes/BigInt.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import StdlibUnittest
2020
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
2121
import Darwin
22-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
22+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
2323
import Glibc
2424
#elseif os(Windows)
2525
import MSVCRT

‎test/lit.cfg

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ elif run_os in ['windows-msvc']:
10841084
('%r -emit-pcm -target %s' % (config.swiftc, config.variant_triple))
10851085

10861086

1087-
elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu'] or
1087+
elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-cygnus', 'windows-gnu'] or
10881088
(kIsAndroid and run_os in ['linux-android', 'linux-androideabi'])):
10891089
# Running lit and the compiler on Android itself is more like running on Linux,
10901090
# ie the NDK and adb aren't needed, so use this instead.
@@ -1107,6 +1107,12 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'w
11071107
config.target_shared_library_prefix = 'lib'
11081108
config.target_shared_library_suffix = ".so"
11091109
config.target_sdk_name = "freebsd"
1110+
elif run_os == 'openbsd':
1111+
lit_config.note("Testing OpenBSD " + config.variant_triple)
1112+
config.target_object_format = "elf"
1113+
config.target_shared_library_prefix = 'lib'
1114+
config.target_shared_library_suffix = ".so"
1115+
config.target_sdk_name = "openbsd"
11101116
elif kIsAndroid:
11111117
lit_config.note("Testing Android " + config.variant_triple)
11121118
config.target_object_format = "elf"

‎test/stdlib/FloatConstants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
44
import Darwin
5-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
5+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
66
import Glibc
77
#elseif os(Windows)
88
import MSVCRT

‎test/stdlib/MathConstants.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
44
import Darwin
5-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
5+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
66
import Glibc
77
#elseif os(Windows)
88
import MSVCRT

‎test/stdlib/PrintFloat.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import StdlibUnittest
1313
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1414
import Darwin
15-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
15+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
1616
import Glibc
1717
#elseif os(Windows)
1818
import MSVCRT

‎test/stdlib/Runtime.swift.gyb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import SwiftShims
1212

1313
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
1414
import Darwin
15-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
15+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
1616
import Glibc
1717
#elseif os(Windows)
1818
import MSVCRT
@@ -603,7 +603,7 @@ Runtime.test("SwiftError layout constants for LLDB") {
603603
expectEqual(40, offsetof_SwiftError_typeMetadata.load(as: UInt.self))
604604
expectEqual(72, sizeof_SwiftError.load(as: UInt.self))
605605
#endif
606-
#elseif os(Linux) || os(Android) || os(Windows)
606+
#elseif os(Linux) || os(Android) || os(Windows) || os(OpenBSD)
607607
expectEqual(16, offsetof_SwiftError_typeMetadata.load(as: UInt.self))
608608
expectEqual(32, sizeof_SwiftError.load(as: UInt.self))
609609
#else

‎test/stdlib/VarArgs.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Swift
66
#if _runtime(_ObjC)
77
import Darwin
88
import CoreGraphics
9-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
9+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
1010
import Glibc
1111
typealias CGFloat = Double
1212
#elseif os(Windows)

‎test/stdlib/mmap.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import StdlibUnittest
66
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
77
import Darwin
8-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
8+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
99
import Glibc
1010
#else
1111
#error("Unsupported platform")

‎test/stdlib/tgmath.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
2121
import Darwin.C.tgmath
22-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
22+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
2323
import Glibc
2424
#elseif os(Windows)
2525
import MSVCRT

‎test/stdlib/tgmath_optimized.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
88
import Darwin
9-
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
9+
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
1010
import Glibc
1111
#elseif os(Windows)
1212
import MSVCRT

0 commit comments

Comments
 (0)