Skip to content

Commit 96eecce

Browse files
committed
tests: Run tests on Linux CI
The EndToEnd tests cannot currently be run: * they deadlock when run under `swift test` (#143) * the CI requires the use of an HTTP proxy to download from the Internet, but SDK generator does not support proxies (#145) The tests are conditionally compiled only on Linux, so we must skip them in CI. Fixes #45
1 parent 542d515 commit 96eecce

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

Docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525

2626
test:
2727
<<: *common
28-
command: /bin/bash -xcl "./Utilities/test.sh $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-}"
28+
command: /bin/bash -xcl "./Utilities/test.sh $${WARN_AS_ERROR_ARG-} $${SANITIZER_ARG-} $${IMPORT_CHECK_ARG-} --skip EndToEndTests"
2929

3030
# util
3131

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ final class EndToEndTests: XCTestCase {
4848
// Do multiple runs with different sets of arguments.
4949
// Test with no arguments by default:
5050
var possibleArguments = [""]
51+
5152
do {
5253
try await Shell.run("docker ps")
5354
possibleArguments.append("--with-docker --linux-distribution-name rhel --linux-distribution-version ubi9")

Utilities/test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,4 @@
1313

1414
set -ex
1515

16-
if [ "$(uname)" = Darwin ]; then
17-
swift test $@
18-
else
19-
swift build --build-tests $@
20-
fi
16+
swift test $@

0 commit comments

Comments
 (0)