dnrops
/
swift-nio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around the SwiftPM layout change. (#2389) 

Motivation:

SwiftPM has changed its default layout for packages in
apple/swift-package-manager#6144. This breaks our CI, which assumes the
prior layout. We should work around this.

Modifications:

Enhance the code to tolerate both layouts.

Result:

Integration tests run on all platforms
This commit is contained in:
Cory Benfield 2023-03-13 13:40:31 +00:00 committed by GitHub
parent e208367c8e
commit 61043a36f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IntegrationTests/tests_02_syscall_wrappers/defines.sh
View File

@ -16,6 +16,11 @@
set -eu
function make_package() {
if [[ ! -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
mkdir "$tmpdir/syscallwrapper/Sources/syscallwrapper/"
mv "$tmpdir"/syscallwrapper/Sources/*.swift "$tmpdir/syscallwrapper/Sources/syscallwrapper/"
fi
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
// swift-tools-version:5.5
// The swift-tools-version declares the minimum version of Swift required to build this package.

8
IntegrationTests/tests_02_syscall_wrappers/test_01_syscall_wrapper_fast.sh
View File

@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
mkdir "$tmpdir/syscallwrapper"
cd "$tmpdir/syscallwrapper"
swift package init --type=executable
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
fi
cat > "$main_path" <<EOF
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
import Darwin
#else

8
IntegrationTests/tests_02_syscall_wrappers/test_02_unacceptable_errnos.sh
View File

@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
mkdir "$tmpdir/syscallwrapper"
cd "$tmpdir/syscallwrapper"
swift package init --type=executable
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
fi
cat > "$main_path" <<EOF
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
import Darwin
#else

8
IntegrationTests/tests_02_syscall_wrappers/test_03_unacceptable_read_errnos.sh
View File

@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
mkdir "$tmpdir/syscallwrapper"
cd "$tmpdir/syscallwrapper"
swift package init --type=executable
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
fi
cat > "$main_path" <<EOF
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
import Darwin
#else