[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

llvm-svn: 310953

15 files changed, 79 insertions, 79 deletions

diff --git a/llvm/test/Bindings/OCaml/analysis.ml b/llvm/test/Bindings/OCaml/analysis.ml
index 22ef153b372..da3e662d62d 100644
--- a/llvm/test/Bindings/OCaml/analysis.ml
+++ b/llvm/test/Bindings/OCaml/analysis.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/analysis.ml
- * RUN: %ocamlc -g -w +A -package llvm.analysis -linkpkg %T/analysis.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.analysis -linkpkg %T/analysis.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/analysis.ml
+ * RUN: %ocamlc -g -w +A -package llvm.analysis -linkpkg %t/analysis.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.analysis -linkpkg %t/analysis.ml -o %t/executable
+ * RUN: %t/executable
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/bitreader.ml b/llvm/test/Bindings/OCaml/bitreader.ml
index 87a165cddc8..2638ca9d8c7 100644
--- a/llvm/test/Bindings/OCaml/bitreader.ml
+++ b/llvm/test/Bindings/OCaml/bitreader.ml
@@ -1,9 +1,9 @@
-(* RUN: cp %s %T/bitreader.ml
- * RUN: %ocamlc -g -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %T/bitreader.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %T/bitreader.ml -o %t
- * RUN: %t %t.bc
- * RUN: llvm-dis < %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/bitreader.ml
+ * RUN: %ocamlc -g -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %t/bitreader.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %t/bitreader.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: llvm-dis < %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/bitwriter.ml b/llvm/test/Bindings/OCaml/bitwriter.ml
index b051b8c61a2..28a61fee91b 100644
--- a/llvm/test/Bindings/OCaml/bitwriter.ml
+++ b/llvm/test/Bindings/OCaml/bitwriter.ml
@@ -1,9 +1,9 @@
-(* RUN: cp %s %T/bitwriter.ml
- * RUN: %ocamlc -g -w -3 -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %T/bitwriter.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w -3 -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %T/bitwriter.ml -o %t
- * RUN: %t %t.bc
- * RUN: llvm-dis < %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/bitwriter.ml
+ * RUN: %ocamlc -g -w -3 -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %t/bitwriter.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w -3 -w +A -package llvm.bitreader -package llvm.bitwriter -linkpkg %t/bitwriter.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: llvm-dis < %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/core.ml b/llvm/test/Bindings/OCaml/core.ml
index 802baa0b80b..801b124c1a4 100644
--- a/llvm/test/Bindings/OCaml/core.ml
+++ b/llvm/test/Bindings/OCaml/core.ml
@@ -1,12 +1,12 @@
-(* RUN: cp %s %T/core.ml
- * RUN: %ocamlc -g -w +A -package llvm.analysis -package llvm.bitwriter -linkpkg %T/core.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.analysis -package llvm.bitwriter -linkpkg %T/core.ml -o %t
- * RUN: %t %t.bc
- * RUN: llvm-dis < %t.bc > %t.ll
- * RUN: FileCheck %s < %t.ll
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/core.ml
+ * RUN: %ocamlc -g -w +A -package llvm.analysis -package llvm.bitwriter -linkpkg %t/core.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.analysis -package llvm.bitwriter -linkpkg %t/core.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: llvm-dis < %t/bitcode.bc > %t/dis.ll
+ * RUN: FileCheck %s < %t/dis.ll
  * Do a second pass for things that shouldn't be anywhere.
- * RUN: FileCheck -check-prefix=CHECK-NOWHERE %s < %t.ll
+ * RUN: FileCheck -check-prefix=CHECK-NOWHERE %s < %t/dis.ll
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/diagnostic_handler.ml b/llvm/test/Bindings/OCaml/diagnostic_handler.ml
index a94ff220b7f..491b2805b70 100644
--- a/llvm/test/Bindings/OCaml/diagnostic_handler.ml
+++ b/llvm/test/Bindings/OCaml/diagnostic_handler.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/diagnostic_handler.ml
- * RUN: %ocamlc -g -w +A -package llvm.bitreader -linkpkg %T/diagnostic_handler.ml -o %t
- * RUN: %t %t.bc | FileCheck %s
- * RUN: %ocamlopt -g -w +A -package llvm.bitreader -linkpkg %T/diagnostic_handler.ml -o %t
- * RUN: %t %t.bc | FileCheck %s
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/diagnostic_handler.ml
+ * RUN: %ocamlc -g -w +A -package llvm.bitreader -linkpkg %t/diagnostic_handler.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc | FileCheck %s
+ * RUN: %ocamlopt -g -w +A -package llvm.bitreader -linkpkg %t/diagnostic_handler.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc | FileCheck %s
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/executionengine.ml b/llvm/test/Bindings/OCaml/executionengine.ml
index 6d9abe72880..d28416820e6 100644
--- a/llvm/test/Bindings/OCaml/executionengine.ml
+++ b/llvm/test/Bindings/OCaml/executionengine.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/executionengine.ml
- * RUN: %ocamlc -g -w +A -package llvm.executionengine -linkpkg %T/executionengine.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.executionengine -linkpkg %T/executionengine.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/executionengine.ml
+ * RUN: %ocamlc -g -w +A -package llvm.executionengine -linkpkg %t/executionengine.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.executionengine -linkpkg %t/executionengine.ml -o %t/executable
+ * RUN: %t/executable
  * REQUIRES: native, object-emission
  * XFAIL: vg_leak
  *)
diff --git a/llvm/test/Bindings/OCaml/ext_exc.ml b/llvm/test/Bindings/OCaml/ext_exc.ml
index 5c9c8476cb9..8ff19cd8e9d 100644
--- a/llvm/test/Bindings/OCaml/ext_exc.ml
+++ b/llvm/test/Bindings/OCaml/ext_exc.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/ext_exc.ml
- * RUN: %ocamlc -g -w +A -package llvm.bitreader -linkpkg %T/ext_exc.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.bitreader -linkpkg %T/ext_exc.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/ext_exc.ml
+ * RUN: %ocamlc -g -w +A -package llvm.bitreader -linkpkg %t/ext_exc.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.bitreader -linkpkg %t/ext_exc.ml -o %t/executable
+ * RUN: %t/executable
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/ipo.ml b/llvm/test/Bindings/OCaml/ipo.ml
index 4a7c73e891b..6a67f37570e 100644
--- a/llvm/test/Bindings/OCaml/ipo.ml
+++ b/llvm/test/Bindings/OCaml/ipo.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/ipo_opts.ml
- * RUN: %ocamlc -g -w +A -package llvm.ipo -linkpkg %T/ipo_opts.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.ipo -linkpkg %T/ipo_opts.ml -o %t
- * RUN: %t %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/ipo_opts.ml
+ * RUN: %ocamlc -g -w +A -package llvm.ipo -linkpkg %t/ipo_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.ipo -linkpkg %t/ipo_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/irreader.ml b/llvm/test/Bindings/OCaml/irreader.ml
index b5142334d32..49b0d9190ee 100644
--- a/llvm/test/Bindings/OCaml/irreader.ml
+++ b/llvm/test/Bindings/OCaml/irreader.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/irreader.ml
- * RUN: %ocamlc -g -w +A -package llvm.irreader -linkpkg %T/irreader.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.irreader -linkpkg %T/irreader.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/irreader.ml
+ * RUN: %ocamlc -g -w +A -package llvm.irreader -linkpkg %t/irreader.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.irreader -linkpkg %t/irreader.ml -o %t/executable
+ * RUN: %t/executable
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/linker.ml b/llvm/test/Bindings/OCaml/linker.ml
index 119ca4cfee9..81d7e9be34a 100644
--- a/llvm/test/Bindings/OCaml/linker.ml
+++ b/llvm/test/Bindings/OCaml/linker.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/linker.ml
- * RUN: %ocamlc -g -w +A -package llvm.linker -linkpkg %T/linker.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.linker -linkpkg %T/linker.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/linker.ml
+ * RUN: %ocamlc -g -w +A -package llvm.linker -linkpkg %t/linker.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.linker -linkpkg %t/linker.ml -o %t/executable
+ * RUN: %t/executable
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/passmgr_builder.ml b/llvm/test/Bindings/OCaml/passmgr_builder.ml
index 3104736d66a..355a627ff71 100644
--- a/llvm/test/Bindings/OCaml/passmgr_builder.ml
+++ b/llvm/test/Bindings/OCaml/passmgr_builder.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/passmgr_builder.ml
- * RUN: %ocamlc -g -w +A -package llvm.passmgr_builder -linkpkg %T/passmgr_builder.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.passmgr_builder -linkpkg %T/passmgr_builder.ml -o %t
- * RUN: %t %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/passmgr_builder.ml
+ * RUN: %ocamlc -g -w +A -package llvm.passmgr_builder -linkpkg %t/passmgr_builder.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.passmgr_builder -linkpkg %t/passmgr_builder.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/scalar_opts.ml b/llvm/test/Bindings/OCaml/scalar_opts.ml
index 9ffcf6915c0..c75e1c8e554 100644
--- a/llvm/test/Bindings/OCaml/scalar_opts.ml
+++ b/llvm/test/Bindings/OCaml/scalar_opts.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/scalar_opts.ml
- * RUN: %ocamlc -g -w +A -package llvm.scalar_opts -linkpkg %T/scalar_opts.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.scalar_opts -linkpkg %T/scalar_opts.ml -o %t
- * RUN: %t %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/scalar_opts.ml
+ * RUN: %ocamlc -g -w +A -package llvm.scalar_opts -linkpkg %t/scalar_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.scalar_opts -linkpkg %t/scalar_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/target.ml b/llvm/test/Bindings/OCaml/target.ml
index b9642eb6888..900668147b7 100644
--- a/llvm/test/Bindings/OCaml/target.ml
+++ b/llvm/test/Bindings/OCaml/target.ml
@@ -1,7 +1,7 @@
-(* RUN: cp %s %T/target.ml
- * RUN: %ocamlc -g -w +A -package llvm.target -package llvm.all_backends -linkpkg %T/target.ml -o %t
- * RUN: %ocamlopt -g -w +A -package llvm.target -package llvm.all_backends -linkpkg %T/target.ml -o %t
- * RUN: %t %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/target.ml
+ * RUN: %ocamlc -g -w +A -package llvm.target -package llvm.all_backends -linkpkg %t/target.ml -o %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.target -package llvm.all_backends -linkpkg %t/target.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/transform_utils.ml b/llvm/test/Bindings/OCaml/transform_utils.ml
index dc14effc57e..f951a0d9c4a 100644
--- a/llvm/test/Bindings/OCaml/transform_utils.ml
+++ b/llvm/test/Bindings/OCaml/transform_utils.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/transform_utils.ml
- * RUN: %ocamlc -g -w +A -package llvm.transform_utils -linkpkg %T/transform_utils.ml -o %t
- * RUN: %t
- * RUN: %ocamlopt -g -w +A -package llvm.transform_utils -linkpkg %T/transform_utils.ml -o %t
- * RUN: %t
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/transform_utils.ml
+ * RUN: %ocamlc -g -w +A -package llvm.transform_utils -linkpkg %t/transform_utils.ml -o %t/executable
+ * RUN: %t/executable
+ * RUN: %ocamlopt -g -w +A -package llvm.transform_utils -linkpkg %t/transform_utils.ml -o %t/executable
+ * RUN: %t/executable
  * XFAIL: vg_leak
  *)
 
diff --git a/llvm/test/Bindings/OCaml/vectorize.ml b/llvm/test/Bindings/OCaml/vectorize.ml
index a668654de74..fab0901d3c5 100644
--- a/llvm/test/Bindings/OCaml/vectorize.ml
+++ b/llvm/test/Bindings/OCaml/vectorize.ml
@@ -1,8 +1,8 @@
-(* RUN: cp %s %T/vectorize_opts.ml
- * RUN: %ocamlc -g -w +A -package llvm.vectorize -linkpkg %T/vectorize_opts.ml -o %t
- * RUN: %t %t.bc
- * RUN: %ocamlopt -g -w +A -package llvm.vectorize -linkpkg %T/vectorize_opts.ml -o %t
- * RUN: %t %t.bc
+(* RUN: rm -rf %t && mkdir -p %t && cp %s %t/vectorize_opts.ml
+ * RUN: %ocamlc -g -w +A -package llvm.vectorize -linkpkg %t/vectorize_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
+ * RUN: %ocamlopt -g -w +A -package llvm.vectorize -linkpkg %t/vectorize_opts.ml -o %t/executable
+ * RUN: %t/executable %t/bitcode.bc
  * XFAIL: vg_leak
  *)