Skip to content

Commit 186b333

Browse files
committed
Update CAS tests (NFC)
Updates 3 additional tests broken by the TMP_DIR addition to PathSanitizingFileCheck.
1 parent 02dbc11 commit 186b333

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

test/CAS/cached_diagnostics_remap.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
// RUN: -emit-module -o %t/test.swiftmodule /^test/test.swift -cache-replay-prefix-map /^test %t 2>&1 | %FileCheck %s --check-prefix REMAP
3737

3838
// BRIDGE: /^test/objc.h:3:2: warning: warning in bridging header
39-
// BRIDGE-REMAP: BUILD_DIR{{.*}}{{/|\\}}objc.h:3:2: warning: warning in bridging header
39+
// BRIDGE-REMAP: TMP_DIR{{/|\\}}objc.h:3:2: warning: warning in bridging header
4040
// CHECK: /^test/test.swift:1:10: warning: this is a warning
41-
// REMAP: BUILD_DIR{{.*}}{{/|\\}}test.swift:1:10: warning: this is a warning
41+
// REMAP: TMP_DIR{{/|\\}}test.swift:1:10: warning: this is a warning
4242

4343
//--- test.swift
4444
#warning("this is a warning")

test/CAS/debug_info_pcm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// RUN: dwarfdump --debug-info @%t/A.path | %FileCheck %s
1818

1919
// CHECK: DW_AT_GNU_dwo_name
20-
// CHECK-SAME: BUILD_DIR
20+
// CHECK-SAME: TMP_DIR
2121

2222
//--- test.swift
2323
import A

test/CAS/module_deps_clang_extras.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
// RUN: %validate-json %t/deps.json &>/dev/null
1818

1919
// RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json Test casFSRootID > %t/fs.casid
20-
// RUN: %cache-tool -cas-path %t/cas -cache-tool-action print-include-tree-list @%t/fs.casid | %FileCheck %s -DDIR=%basename_t -check-prefix FS_ROOT
20+
// RUN: %cache-tool -cas-path %t/cas -cache-tool-action print-include-tree-list @%t/fs.casid | %FileCheck %s -check-prefix FS_ROOT
2121

22-
// FS_ROOT: [[DIR]].tmp/hidden/Dummy.h
23-
// FS_ROOT: [[DIR]].tmp/hidden/a.h
24-
// FS_ROOT: [[DIR]].tmp/hidden/b.h
22+
// FS_ROOT: TMP_DIR/hidden/Dummy.h
23+
// FS_ROOT: TMP_DIR/hidden/a.h
24+
// FS_ROOT: TMP_DIR/hidden/b.h
2525

2626
// RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json clang:SwiftShims > %t/shim.cmd
2727
// RUN: %swift_frontend_plain @%t/shim.cmd

0 commit comments

Comments
 (0)