diff --git a/schemes/main/build/run-test.sh b/schemes/main/build/run-test.sh index a7f56671..2fef475f 100755 --- a/schemes/main/build/run-test.sh +++ b/schemes/main/build/run-test.sh @@ -6,4 +6,5 @@ SOURCE_PATH="$(cd "$(dirname "$0")/../../../.." && pwd)" TARGET_BUILD_ROOT="$SOURCE_PATH/build/WebAssembly" HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//') -env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX" +# Force using the new driver for testing until https://github.com/swiftlang/swift-driver/pull/1756 +env SWIFT_FORCE_TEST_NEW_DRIVER=1 "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX" diff --git a/schemes/main/manifest.json b/schemes/main/manifest.json index 1326888f..9dd7f49d 100644 --- a/schemes/main/manifest.json +++ b/schemes/main/manifest.json @@ -1,5 +1,5 @@ { - "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-12-04-a", + "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-12-10-a", "build-compiler": false, "icu4c": [], "libxml2": [ diff --git a/test/swift-sdk/foundation/FileManager.swift b/test/swift-sdk/foundation/FileManager.swift index 8cbb3e00..0584b803 100644 --- a/test/swift-sdk/foundation/FileManager.swift +++ b/test/swift-sdk/foundation/FileManager.swift @@ -14,7 +14,7 @@ print("chdir: \(chdirResult)") // CHECK: cwd: /tmp print("cwd: \(FileManager.default.currentDirectoryPath)") -// CHECK: homeDirectory: file:///var/empty/ +// CHECK: homeDirectory: nil print("homeDirectory: \(FileManager.default.homeDirectory(forUser: "nobody")?.absoluteString ?? "nil")") // CHECK: temporaryDirectory: file:///tmp/ diff --git a/test/toolchain/foundation/FileManager.swift b/test/toolchain/foundation/FileManager.swift index 52ce2a1c..4b480a7d 100644 --- a/test/toolchain/foundation/FileManager.swift +++ b/test/toolchain/foundation/FileManager.swift @@ -14,7 +14,7 @@ print("chdir: \(chdirResult)") // CHECK: cwd: /tmp print("cwd: \(FileManager.default.currentDirectoryPath)") -// CHECK: homeDirectory: file:///var/empty/ +// CHECK: homeDirectory: nil print("homeDirectory: \(FileManager.default.homeDirectory(forUser: "nobody")?.absoluteString ?? "nil")") // CHECK: temporaryDirectory: file:///tmp/