fix integration tests on Darwin (#4)
Motivation: The integration tests didn't work on Darwin anymore as the `CNIODarwin` module wasn't included in their build. Modifications: Included the `CNIODarwin` module, just like `CNIOLinux`. Result: integration tests run on Darwin
This commit is contained in:
parent
e41acdaa4d
commit
de0bc1ed83
|
@ -0,0 +1,34 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
function make_package() {
|
||||||
|
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
|
||||||
|
// swift-tools-version:4.0
|
||||||
|
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||||
|
|
||||||
|
import PackageDescription
|
||||||
|
|
||||||
|
let package = Package(
|
||||||
|
name: "syscallwrapper",
|
||||||
|
dependencies: [],
|
||||||
|
targets: [
|
||||||
|
.target(
|
||||||
|
name: "syscallwrapper",
|
||||||
|
dependencies: ["CNIOLinux", "CNIODarwin"]),
|
||||||
|
.target(
|
||||||
|
name: "CNIOLinux",
|
||||||
|
dependencies: []),
|
||||||
|
.target(
|
||||||
|
name: "CNIODarwin",
|
||||||
|
dependencies: []),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
EOF
|
||||||
|
cp "$here/../../Tests/NIOTests/SystemCallWrapperHelpers.swift" \
|
||||||
|
"$here/../../Sources/NIO/System.swift" \
|
||||||
|
"$here/../../Sources/NIO/IO.swift" \
|
||||||
|
"$tmpdir/syscallwrapper/Sources/syscallwrapper"
|
||||||
|
ln -s "$here/../../Sources/CNIOLinux" "$tmpdir/syscallwrapper/Sources"
|
||||||
|
ln -s "$here/../../Sources/CNIODarwin" "$tmpdir/syscallwrapper/Sources"
|
||||||
|
}
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
source defines.sh
|
||||||
|
|
||||||
swift_binary=swift
|
swift_binary=swift
|
||||||
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
@ -25,31 +27,8 @@ public typealias IOVector = iovec
|
||||||
runStandalone()
|
runStandalone()
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
|
make_package
|
||||||
// swift-tools-version:4.0
|
|
||||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
|
||||||
|
|
||||||
import PackageDescription
|
|
||||||
|
|
||||||
let package = Package(
|
|
||||||
name: "syscallwrapper",
|
|
||||||
dependencies: [],
|
|
||||||
targets: [
|
|
||||||
.target(
|
|
||||||
name: "syscallwrapper",
|
|
||||||
dependencies: ["CNIOLinux"]),
|
|
||||||
.target(
|
|
||||||
name: "CNIOLinux",
|
|
||||||
dependencies: []),
|
|
||||||
]
|
|
||||||
)
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cp "$here/../../Tests/NIOTests/SystemCallWrapperHelpers.swift" \
|
|
||||||
"$here/../../Sources/NIO/System.swift" \
|
|
||||||
"$here/../../Sources/NIO/IO.swift" \
|
|
||||||
"$tmpdir/syscallwrapper/Sources/syscallwrapper"
|
|
||||||
ln -s "$here/../../Sources/CNIOLinux" "$tmpdir/syscallwrapper/Sources"
|
|
||||||
"$swift_binary" run -c release -Xswiftc -DRUNNING_INTEGRATION_TESTS
|
"$swift_binary" run -c release -Xswiftc -DRUNNING_INTEGRATION_TESTS
|
||||||
|
|
||||||
rm -rf "$tmpdir"
|
rm -rf "$tmpdir"
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
source defines.sh
|
||||||
|
|
||||||
swift_binary=swift
|
swift_binary=swift
|
||||||
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
@ -43,31 +45,8 @@ _ = try? withUnsafePointer(to: &whatevs) { ptr in
|
||||||
exit(42)
|
exit(42)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
|
make_package
|
||||||
// swift-tools-version:4.0
|
|
||||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
|
||||||
|
|
||||||
import PackageDescription
|
|
||||||
|
|
||||||
let package = Package(
|
|
||||||
name: "syscallwrapper",
|
|
||||||
dependencies: [],
|
|
||||||
targets: [
|
|
||||||
.target(
|
|
||||||
name: "syscallwrapper",
|
|
||||||
dependencies: ["CNIOLinux"]),
|
|
||||||
.target(
|
|
||||||
name: "CNIOLinux",
|
|
||||||
dependencies: []),
|
|
||||||
]
|
|
||||||
)
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cp "$here/../../Tests/NIOTests/SystemCallWrapperHelpers.swift" \
|
|
||||||
"$here/../../Sources/NIO/System.swift" \
|
|
||||||
"$here/../../Sources/NIO/IO.swift" \
|
|
||||||
"$tmpdir/syscallwrapper/Sources/syscallwrapper"
|
|
||||||
ln -s "$here/../../Sources/CNIOLinux" "$tmpdir/syscallwrapper/Sources"
|
|
||||||
for mode in debug release; do
|
for mode in debug release; do
|
||||||
for error in EFAULT EBADF; do
|
for error in EFAULT EBADF; do
|
||||||
temp_file="$tmp/stderr"
|
temp_file="$tmp/stderr"
|
||||||
|
|
Loading…
Reference in New Issue