Skip to content

Commit 0cb95da

Browse files
committed
fixed Path joins
1 parent 63e4025 commit 0cb95da

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Sources/SWBTestSupport/BuildDescriptionBasedTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extension CoreBasedTests {
5252
workspaceContext.updateUserPreferences(.defaultForTesting)
5353

5454
// Configure fake user and system info.
55-
workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path.root.join("/Users/exampleUser"), environment: [:]))
55+
workspaceContext.updateUserInfo(UserInfo(user: "exampleUser", group: "exampleGroup", uid: 1234, gid:12345, home: Path.root.join("Users/exampleUser"), environment: [:]))
5656
workspaceContext.updateSystemInfo(SystemInfo(operatingSystemVersion: Version(99, 98, 97), productBuildVersion: "99A98", nativeArchitecture: "x86_64"))
5757

5858
let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)

Tests/SWBCoreTests/SettingsTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1967,8 +1967,8 @@ import SWBMacro
19671967
}
19681968

19691969
let scope = settings.globalScope
1970-
#expect(scope.evaluate(BuiltinMacros.SYMROOT) == Path.root.join("/tmp/Workspace/aProject/build"))
1971-
#expect(scope.evaluate(BuiltinMacros.DSTROOT) == Path.root.join("/tmp/Workspace/aProject/build/foo/bar/dst"))
1970+
#expect(scope.evaluate(BuiltinMacros.SYMROOT) == Path.root.join("tmp/Workspace/aProject/build"))
1971+
#expect(scope.evaluate(BuiltinMacros.DSTROOT) == Path.root.join("tmp/Workspace/aProject/build/foo/bar/dst"))
19721972
}
19731973

19741974
@Test(.requireSDKs(.tvOS))

Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,16 +390,16 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
390390
do {
391391
let fs = PseudoFS()
392392
try fs.createDirectory(Path.root.join("User/Foo"), recursive: true)
393-
try await check(fs: fs, expected: [Path.root.join("/User").str, Path.root.join("/User/Foo").str], expectedSource: .new)
394-
try await check(fs: fs, expected: [Path.root.join("/User").str, Path.root.join("/User/Foo").str], expectedSource: .inMemoryCache)
393+
try await check(fs: fs, expected: [Path.root.join("User").str, Path.root.join("User/Foo").str], expectedSource: .new)
394+
try await check(fs: fs, expected: [Path.root.join("User").str, Path.root.join("User/Foo").str], expectedSource: .inMemoryCache)
395395
}
396396

397397
// Check after adding a path.
398398
do {
399399
let fs = PseudoFS()
400400
try fs.createDirectory(Path.root.join("User/Foo/Bar"), recursive: true)
401-
try await check(fs: fs, expected: [Path.root.join("/User").str, Path.root.join("/User/Foo").str, Path.root.join("/User/Foo/Bar").str], expectedSource: .new)
402-
try await check(fs: fs, expected: [Path.root.join("/User").str, Path.root.join("/User/Foo").str, Path.root.join("/User/Foo/Bar").str], expectedSource: .inMemoryCache)
401+
try await check(fs: fs, expected: [Path.root.join("User").str, Path.root.join("User/Foo").str, Path.root.join("User/Foo/Bar").str], expectedSource: .new)
402+
try await check(fs: fs, expected: [Path.root.join("User").str, Path.root.join("User/Foo").str, Path.root.join("User/Foo/Bar").str], expectedSource: .inMemoryCache)
403403
}
404404
}
405405
}

0 commit comments

Comments
 (0)