Skip to content

Commit 18ad4e3

Browse files
Swift 6.1 and later uses .xctest for XCTest bundle
1 parent 7a7acb4 commit 18ad4e3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,18 @@ test:
2121
CONFIGURATION=release SWIFT_BUILD_FLAGS="$(SWIFT_BUILD_FLAGS)" $(MAKE) test && \
2222
CONFIGURATION=release SWIFT_BUILD_FLAGS="$(SWIFT_BUILD_FLAGS) -Xswiftc -DJAVASCRIPTKIT_WITHOUT_WEAKREFS" $(MAKE) test
2323

24+
TEST_RUNNER := node --experimental-wasi-unstable-preview1 scripts/test-harness.mjs
2425
.PHONY: unittest
2526
unittest:
2627
@echo Running unit tests
2728
swift build --build-tests -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export-if-defined=main -Xlinker --export-if-defined=__main_argc_argv --static-swift-stdlib -Xswiftc -static-stdlib $(SWIFT_BUILD_FLAGS)
28-
node --experimental-wasi-unstable-preview1 scripts/test-harness.mjs ./.build/debug/JavaScriptKitPackageTests.wasm
29+
# Swift 6.1 and later uses .xctest for XCTest bundle but earliers used .wasm
30+
# See https://github.com/swiftlang/swift-package-manager/pull/8254
31+
if [ -f .build/debug/JavaScriptKitPackageTests.xctest ]; then \
32+
$(TEST_RUNNER) .build/debug/JavaScriptKitPackageTests.xctest; \
33+
else \
34+
$(TEST_RUNNER) .build/debug/JavaScriptKitPackageTests.wasm; \
35+
fi
2936

3037
.PHONY: benchmark_setup
3138
benchmark_setup:

0 commit comments

Comments
 (0)