Skip to content

Commit 6b7a8e9

Browse files
[clang] Remove use of %T from crash-report-modules.m (#151615)
This patch removes the use of %T from crash-report-modules.m. %T has been deprecated for about seven years, and is to be avoided as it can lead to races between tests. Posting this one as a separate patch given it was explicitly ported to %T in 5c268f0. Given 36bb47c was landed seven years ago to completely disable the test on Windows due to continued failures, I think it should be fine to just leave this test unsupported on Windows.
1 parent 1e8b65d commit 6b7a8e9

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

clang/test/Driver/crash-report-modules.m

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
// FIXME: Instead of %T/crmdir, it would be nice to just use %t, but the
2-
// filename ran into path length limits for the rm command on some Windows
3-
// bots.
4-
// RUN: rm -rf %T/crmdir
5-
// RUN: mkdir -p %T/crmdir/i %T/crmdir/m
1+
// RUN: rm -rf %t/crmdir
2+
// RUN: mkdir -p %t/crmdir/i %t/crmdir/m
63

7-
// RUN: env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%T/crmdir TEMP=%T/crmdir TMP=%T/crmdir \
4+
// RUN: env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t/crmdir TEMP=%t/crmdir TMP=%t/crmdir \
85
// RUN: not %clang -fsyntax-only %s -I %S/Inputs/module -isysroot %/t/i/ \
9-
// RUN: -fmodules -fmodules-cache-path=%T/crmdir/m/ -DFOO=BAR 2>&1 | FileCheck %s
6+
// RUN: -fmodules -fmodules-cache-path=%t/crmdir/m/ -DFOO=BAR 2>&1 | FileCheck %s
107

11-
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %T/crmdir/crash-report-*.m
12-
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %T/crmdir/crash-report-*.sh
8+
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crmdir/crash-report-*.m
9+
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crmdir/crash-report-*.sh
1310
// REQUIRES: crash-recovery
1411

1512
// FIXME: This test creates excessively deep directory hierarchies that cause

0 commit comments

Comments
 (0)