Skip to content

Commit 514fd1f

Browse files
Merge pull request #470 from swiftwasm/update-base-tag/main-swift-DEVELOPMENT-SNAPSHOT-2024-12-10-a
Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-12-10-a
2 parents 1d689a8 + 823630f commit 514fd1f

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

schemes/main/build/run-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ SOURCE_PATH="$(cd "$(dirname "$0")/../../../.." && pwd)"
66
TARGET_BUILD_ROOT="$SOURCE_PATH/build/WebAssembly"
77

88
HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//')
9-
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"
9+
# Force using the new driver for testing until https://github.com/swiftlang/swift-driver/pull/1756
10+
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"

schemes/main/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-12-04-a",
2+
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-12-10-a",
33
"build-compiler": false,
44
"icu4c": [],
55
"libxml2": [

test/swift-sdk/foundation/FileManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ print("chdir: \(chdirResult)")
1414
// CHECK: cwd: /tmp
1515
print("cwd: \(FileManager.default.currentDirectoryPath)")
1616

17-
// CHECK: homeDirectory: file:///var/empty/
17+
// CHECK: homeDirectory: nil
1818
print("homeDirectory: \(FileManager.default.homeDirectory(forUser: "nobody")?.absoluteString ?? "nil")")
1919

2020
// CHECK: temporaryDirectory: file:///tmp/

test/toolchain/foundation/FileManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ print("chdir: \(chdirResult)")
1414
// CHECK: cwd: /tmp
1515
print("cwd: \(FileManager.default.currentDirectoryPath)")
1616

17-
// CHECK: homeDirectory: file:///var/empty/
17+
// CHECK: homeDirectory: nil
1818
print("homeDirectory: \(FileManager.default.homeDirectory(forUser: "nobody")?.absoluteString ?? "nil")")
1919

2020
// CHECK: temporaryDirectory: file:///tmp/

0 commit comments

Comments
 (0)