Revert "[lit] Clean output directories before running tests."

This reverts commit da6318a92fba793e4f2447ec478b001392d57d43.

This is causing failures on some build bots due to what appears
to be some kind of lit ordering dependency.

llvm-svn: 306833

12 files changed, 35 insertions, 53 deletions

diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.cpp b/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.cpp
deleted file mode 100644
index d7361f475a2..00000000000
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f1();
-__attribute__((always_inline)) void f2() {
-  f1();
-}
-void f3() {
-  f2();
-}
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo b/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo
index 44bdaf4bffe..2a3bc57caa6 100644
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.dwo
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o b/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o
index 540302785c2..b6993c6cae2 100644
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-addr-object-relocation.o
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo
index 94cc3e9d0f7..4df9894b089 100644
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.dwo
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.o b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.o
index dd0cda4a8ff..aa4ab4bc76f 100644
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.o
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu.o
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu1.cpp b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu1.cpp
deleted file mode 100644
index 9bed4bf8b5e..00000000000
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu1.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-extern int i;
-int i;
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu2.cpp b/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu2.cpp
deleted file mode 100644
index 1d17cf38037..00000000000
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-multiple-cu2.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-void f1();
-inline __attribute__((always_inline)) void f2() {
-  f1();
-}
-void f3() {
-  f2();
-}
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-test b/llvm/test/DebugInfo/Inputs/split-dwarf-test
index 0e9d4c880bb..4d6aa0cd98a 100755
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-test
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-test
diff --git a/llvm/test/DebugInfo/Inputs/split-dwarf-test.dwo b/llvm/test/DebugInfo/Inputs/split-dwarf-test.dwo
index fb5eb9c0ffa..588374d7d21 100644
--- a/llvm/test/DebugInfo/Inputs/split-dwarf-test.dwo
+++ b/llvm/test/DebugInfo/Inputs/split-dwarf-test.dwo
diff --git a/llvm/test/DebugInfo/llvm-symbolizer.test b/llvm/test/DebugInfo/llvm-symbolizer.test
index 49da075a451..2c64804659f 100644
--- a/llvm/test/DebugInfo/llvm-symbolizer.test
+++ b/llvm/test/DebugInfo/llvm-symbolizer.test
@@ -20,8 +20,8 @@ RUN: echo "%p/Inputs/llvm-symbolizer-dwo-test 0x400514" >> %t.input
 RUN: echo "%p/Inputs/fission-ranges.elf-x86_64 0x720" >> %t.input
 RUN: echo "%p/Inputs/arange-overlap.elf-x86_64 0x714" >> %t.input
 RUN: cp %p/Inputs/split-dwarf-test.dwo %T
-RUN: echo "%p/Inputs/split-dwarf-test 0x400504" >> %t.input
-RUN: echo "%p/Inputs/split-dwarf-test 0x4004f0" >> %t.input
+RUN: echo "%p/Inputs/split-dwarf-test 0x4005d4" >> %t.input
+RUN: echo "%p/Inputs/split-dwarf-test 0x4005c4" >> %t.input
 RUN: echo "%p/Inputs/cross-cu-inlining.x86_64-macho.o 0x17" >> %t.input
 RUN: cp %p/Inputs/split-dwarf-multiple-cu.dwo %T
 RUN: echo "%p/Inputs/split-dwarf-multiple-cu.o 0x4" >> %t.input
@@ -141,9 +141,9 @@ CHECK-NEXT: main
 CHECK-NEXT: /tmp{{[/\\]}}cross-cu-inlining.c:11:0
 
 CHECK:      f2
-CHECK-NEXT: split-dwarf-multiple-cu2.cpp:3:3
+CHECK-NEXT: b.cpp:3:3
 CHECK-NEXT: f3
-CHECK-NEXT: split-dwarf-multiple-cu2.cpp:6:0
+CHECK-NEXT: b.cpp:6:0
 
 CHECK:      f2
 CHECK-NEXT: split-dwarf-addr-object-relocation.cpp:3:3
diff --git a/llvm/test/Other/lit-globbing.ll b/llvm/test/Other/lit-globbing.ll
index b60510ab8b2..5a668a90a40 100644
--- a/llvm/test/Other/lit-globbing.ll
+++ b/llvm/test/Other/lit-globbing.ll
@@ -1,28 +1,28 @@
-RUN: echo XXA > %T/XXA.txt
-RUN: echo XXB > %T/XXB.txt
-RUN: echo XXAB > %T/XXAB.txt
-
-RUN: echo %T/XXA* | FileCheck -check-prefix=STAR %s
-RUN: echo %T/'XXA'* | FileCheck -check-prefix=STAR %s
-RUN: echo %T/XX'A'* | FileCheck -check-prefix=STAR %s
-
-RUN: echo %T/XX?.txt | FileCheck -check-prefix=QUESTION %s
-RUN: echo %T/'XX'?.txt | FileCheck -check-prefix=QUESTION %s
-
-RUN: echo %T/XX??.txt | FileCheck -check-prefix=QUESTION2 %s
-RUN: echo %T/'XX'??.txt | FileCheck -check-prefix=QUESTION2 %s
-
-RUN: echo 'XX*' 'XX?.txt' 'XX??.txt' | FileCheck -check-prefix=QUOTEDARGS %s
-
-STAR-NOT: XXB.txt
-STAR: {{(XXA.txt.*XXAB.txt|XXAB.txt.*XXA.txt)}}
-
-QUESTION-NOT: XXAB.txt
-QUESTION: {{(XXA.txt.*XXB.txt|XXB.txt.*XXA.txt)}}
-
-QUESTION2-NOT: XXA.txt
-QUESTION2-NOT: XXB.txt
-QUESTION2: XXAB.txt
-
-QUOTEDARGS-NOT: .txt
-QUOTEDARGS: XX* XX?.txt XX??.txt
+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)}}

+

+QUESTION-NOT: TAB.txt

+QUESTION: {{(TA.txt.*TB.txt|TB.txt.*TA.txt)}}

+

+QUESTION2-NOT: TA.txt

+QUESTION2-NOT: TB.txt

+QUESTION2: TAB.txt

+

+QUOTEDARGS-NOT: .txt

+QUOTEDARGS: T* T?.txt T??.txt

diff --git a/llvm/test/Unit/lit.cfg b/llvm/test/Unit/lit.cfg
index a3c00d6d18c..dac0bf829ba 100644
--- a/llvm/test/Unit/lit.cfg
+++ b/llvm/test/Unit/lit.cfg
@@ -39,11 +39,9 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']:
         config.environment[symbolizer] = os.environ[symbolizer]
 
 # Win32 seeks DLLs along %PATH%.
-if sys.platform in ['win32', 'cygwin']:
-	shlibdir = getattr(config, 'shlibdir', None)
-	if shlibdir is not None and os.path.isdir(shlibdir):
-	    config.environment['PATH'] = os.path.pathsep.join((
-	            config.shlibdir, config.environment['PATH']))
+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
+    config.environment['PATH'] = os.path.pathsep.join((
+            config.shlibdir, config.environment['PATH']))
 
 # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate.
 if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: