Skip to content

Commit 510b939

Browse files
Merge pull request #3641 from swiftwasm/katei/enable-concurrency-test-main
[ci] Enable Concurrency Runtime tests on CI
2 parents 3702a00 + 86b1bf8 commit 510b939

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ jobs:
150150
TARGET_STDLIB_BUILD_DIR=${{ github.workspace }}/target-build/swift-stdlib-wasi-wasm32
151151
./swift/utils/run-test --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
152152
"$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/stdlib"
153+
./swift/utils/run-test --build-dir "$TARGET_STDLIB_BUILD_DIR" --target wasi-wasm32 \
154+
"$TARGET_STDLIB_BUILD_DIR/test-wasi-wasm32/Concurrency/Runtime"
153155
154156
- name: Run all tests for wasi-wasm32
155157
if: ${{ matrix.run_full_test }}

cmake/caches/Runtime-WASI-wasm32.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ set(SWIFT_STDLIB_ENABLE_THINCMO YES CACHE BOOL "")
2727
# build with the host compiler
2828
set(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER YES CACHE BOOL "")
2929

30-
set(SWIFT_STDLIB_SINGLE_THREADED_RUNTIME YES CACHE BOOL "")
30+
set(SWIFT_STDLIB_SINGLE_THREADED_RUNTIME TRUE CACHE BOOL "")

test/Concurrency/Runtime/checked_continuation.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ struct TestError: Error {}
1515
var tests = TestSuite("CheckedContinuation")
1616

1717
if #available(SwiftStdlib 5.5, *) {
18+
// Disable crash tests
19+
#if !os(WASI)
1820
tests.test("trap on double resume non-throwing continuation") {
1921
expectCrashLater()
2022

@@ -41,7 +43,7 @@ struct TestError: Error {}
4143
}
4244
await task.get()
4345
}
44-
46+
#endif
4547
tests.test("test withCheckedThrowingContinuation") {
4648
let task2 = detach {
4749
do {

utils/webassembly/build-presets.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#===----------------------------------------------------------------------===#
44

55
[preset: webassembly]
6-
sccache
76
skip-build-benchmarks
87
llvm-targets-to-build=X86;AArch64;WebAssembly
98
swift-darwin-supported-archs=%(HOST_ARCHITECTURE)s

0 commit comments

Comments
 (0)