summaryrefslogtreecommitdiff
path: root/test/Other
diff options
context:
space:
mode:
authorKuba Mracek <mracek@apple.com>2017-08-15 20:29:24 +0000
committerKuba Mracek <mracek@apple.com>2017-08-15 20:29:24 +0000
commitea547739945307c5b22e647d3c17f5b53ebaba9b (patch)
tree4ee1a42abd893d085cbb9b0b0ff8f587342b2caf /test/Other
parent0388fb65f3a015cb916d799e7a0a8a2e08144aa4 (diff)
[llvm] Get rid of "%T" expansions
The %T lit expansion expands to a common directory shared between all the tests in the same directory, which is unexpected and unintuitive, and more importantly, it's been a source of subtle race conditions and flaky tests. In https://reviews.llvm.org/D35396, it was agreed that it would be best to simply ban %T and only keep %t, which is unique to each test. When a test needs a temporary directory, it can just create one using mkdir %t. This patch removes %T in llvm. Differential Revision: https://reviews.llvm.org/D36495 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@310953 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Other')
-rw-r--r--test/Other/can-execute.txt7
-rw-r--r--test/Other/lit-globbing.ll33
2 files changed, 21 insertions, 19 deletions
diff --git a/test/Other/can-execute.txt b/test/Other/can-execute.txt
index fd6961f86bf..9160e463744 100644
--- a/test/Other/can-execute.txt
+++ b/test/Other/can-execute.txt
@@ -14,7 +14,8 @@ If we want, it is probably OK to change the semantics of can_execute and this
test, but for now this test serves as a reminder to audit all the callers if
we do that.
-RUN: cp -f %S/Inputs/TestProg/TestProg %T/TestProg
-RUN: chmod 111 %T/TestProg
-RUN: export PATH=%S/Inputs:%T:%S/Inputs/TestProg:$PATH
+RUN: rm -rf %t && mkdir -p %t
+RUN: cp -f %S/Inputs/TestProg/TestProg %t/TestProg
+RUN: chmod 111 %t/TestProg
+RUN: export PATH=%S/Inputs:%t:%S/Inputs/TestProg:$PATH
RUN: not TestProg
diff --git a/test/Other/lit-globbing.ll b/test/Other/lit-globbing.ll
index 5a668a90a40..3b3a647af18 100644
--- a/test/Other/lit-globbing.ll
+++ b/test/Other/lit-globbing.ll
@@ -1,19 +1,20 @@
-RUN: echo TA > %T/TA.txt
-RUN: echo TB > %T/TB.txt
-RUN: echo TAB > %T/TAB.txt
-
-RUN: echo %T/TA* | FileCheck -check-prefix=STAR %s
-RUN: echo %T/'TA'* | FileCheck -check-prefix=STAR %s
-RUN: echo %T/T'A'* | FileCheck -check-prefix=STAR %s
-
-RUN: echo %T/T?.txt | FileCheck -check-prefix=QUESTION %s
-RUN: echo %T/'T'?.txt | FileCheck -check-prefix=QUESTION %s
-
-RUN: echo %T/T??.txt | FileCheck -check-prefix=QUESTION2 %s
-RUN: echo %T/'T'??.txt | FileCheck -check-prefix=QUESTION2 %s
-
-RUN: echo 'T*' 'T?.txt' 'T??.txt' | FileCheck -check-prefix=QUOTEDARGS %s
-
+RUN: rm -rf %t && mkdir -p %t
+RUN: echo TA > %t/TA.txt
+RUN: echo TB > %t/TB.txt
+RUN: echo TAB > %t/TAB.txt
+
+RUN: echo %t/TA* | FileCheck -check-prefix=STAR %s
+RUN: echo %t/'TA'* | FileCheck -check-prefix=STAR %s
+RUN: echo %t/T'A'* | FileCheck -check-prefix=STAR %s
+
+RUN: echo %t/T?.txt | FileCheck -check-prefix=QUESTION %s
+RUN: echo %t/'T'?.txt | FileCheck -check-prefix=QUESTION %s
+
+RUN: echo %t/T??.txt | FileCheck -check-prefix=QUESTION2 %s
+RUN: echo %t/'T'??.txt | FileCheck -check-prefix=QUESTION2 %s
+
+RUN: echo 'T*' 'T?.txt' 'T??.txt' | FileCheck -check-prefix=QUOTEDARGS %s
+
STAR-NOT: TB.txt
STAR: {{(TA.txt.*TAB.txt|TAB.txt.*TA.txt)}}