[llvm-dwp] Clean up tests X86/*.test

llvm-svn: 341688

6 files changed, 8 insertions, 15 deletions

diff --git a/llvm/test/tools/llvm-dwp/X86/compress.test b/llvm/test/tools/llvm-dwp/X86/compress.test
index 94275f4a176..ed405cb48c3 100644
--- a/llvm/test/tools/llvm-dwp/X86/compress.test
+++ b/llvm/test/tools/llvm-dwp/X86/compress.test
@@ -1,8 +1,7 @@
+REQUIRES: zlib
 RUN: llvm-dwp %p/../Inputs/compress/a.dwo -o %t
 RUN: llvm-dwarfdump -v %t | FileCheck %s
 
-REQUIRES: zlib
-
 Simple test built from this input which produces DWARF long enough to be compressed in the .[z]debug_info section:
 
   void f(int a, int b, int c, int d) {
diff --git a/llvm/test/tools/llvm-dwp/X86/compressfail.test b/llvm/test/tools/llvm-dwp/X86/compressfail.test
index b1961e82a76..0d95ec73dd0 100644
--- a/llvm/test/tools/llvm-dwp/X86/compressfail.test
+++ b/llvm/test/tools/llvm-dwp/X86/compressfail.test
@@ -1,7 +1,6 @@
+REQUIRES: zlib
 RUN: not llvm-dwp %p/../Inputs/compressfail/a.dwo -o %t 2>&1 | FileCheck %s
 RUN: not llvm-dwp %p/../Inputs/empty_compressed_section.dwo -o %t 2>&1 | FileCheck %s
 RUN: not llvm-dwp %p/../Inputs/invalid_compressed.dwo -o %t 2>&1 | FileCheck %s
 
-REQUIRES: zlib
-
 CHECK: error: failure while decompressing compressed section: '.zdebug_{{.*}}.dwo'
diff --git a/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test b/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
index 3642d2ed333..46f5063a968 100644
--- a/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
+++ b/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
@@ -10,8 +10,7 @@ RUN: cp %p/../Inputs/dwos_list_from_exec/d.dwo d.dwo
 RUN: cp %p/../Inputs/dwos_list_from_exec/e.dwo e.dwo
 RUN: cp %p/../Inputs/dwos_list_from_exec/main main
 RUN: cp %p/../Inputs/dwos_list_from_exec/libd.so libd.so
-RUN: llvm-dwp c.dwo e.dwo -e main -e libd.so -o pkg.dwp
-RUN: llvm-dwarfdump -v pkg.dwp | FileCheck %s
+RUN: llvm-dwp c.dwo e.dwo -e main -e libd.so -o - | llvm-dwarfdump -v - | FileCheck %s
 
 Build commands for the test binaries:
 
diff --git a/llvm/test/tools/llvm-dwp/X86/gcc_type.test b/llvm/test/tools/llvm-dwp/X86/gcc_type.test
index 3b7af9c6683..7bb1a64cd2d 100644
--- a/llvm/test/tools/llvm-dwp/X86/gcc_type.test
+++ b/llvm/test/tools/llvm-dwp/X86/gcc_type.test
@@ -1,5 +1,4 @@
-RUN: llvm-dwp %p/../Inputs/gcc_type/a.dwo -o %t
-RUN: llvm-dwarfdump -v %t | FileCheck %s
+RUN: llvm-dwp %p/../Inputs/gcc_type/a.dwo -o - | llvm-dwarfdump -v - | FileCheck %s
 RUN: not llvm-dwp %p/../Inputs/gcc_type/a.dwo %p/../Inputs/gcc_type/a.dwo -o %t 2>&1 | FileCheck --check-prefix=DUP %s
 
 CHECK: Type Unit
diff --git a/llvm/test/tools/llvm-dwp/X86/nocompress.test b/llvm/test/tools/llvm-dwp/X86/nocompress.test
index c3df6b3fcca..eaf2af2344d 100644
--- a/llvm/test/tools/llvm-dwp/X86/nocompress.test
+++ b/llvm/test/tools/llvm-dwp/X86/nocompress.test
@@ -1,5 +1,4 @@
-RUN: not llvm-dwp %p/../Inputs/compress/a.dwo -o %t 2>&1 | FileCheck %s
-
 REQUIRES: nozlib
+RUN: not llvm-dwp %p/../Inputs/compress/a.dwo -o %t 2>&1 | FileCheck %s
 
 CHECK: error: failure while decompressing compressed section: '.zdebug_{{.*}}.dwo', zlib is not available
diff --git a/llvm/test/tools/llvm-dwp/X86/simple.test b/llvm/test/tools/llvm-dwp/X86/simple.test
index bba004e9e9d..788e6f5cfe4 100644
--- a/llvm/test/tools/llvm-dwp/X86/simple.test
+++ b/llvm/test/tools/llvm-dwp/X86/simple.test
@@ -1,10 +1,8 @@
 RUN: llvm-dwp %p/../Inputs/simple/notypes/a.dwo %p/../Inputs/simple/notypes/b.dwo -o %t
-RUN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
+RUN: llvm-dwarfdump -v %t | FileCheck --check-prefixes=CHECK,NOTYP %s
 RUN: llvm-objdump -h %t | FileCheck --check-prefix=NOTYPOBJ %s
-RUN: llvm-dwp %p/../Inputs/simple/types/a.dwo %p/../Inputs/simple/types/b.dwo -o %t
-RUN: llvm-dwarfdump -v %t | FileCheck --check-prefixes=CHECK,TYPES %s
-
-FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump -v doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
+RUN: llvm-dwp %p/../Inputs/simple/types/a.dwo %p/../Inputs/simple/types/b.dwo -o - \
+RUN:   | llvm-dwarfdump -v - | FileCheck --check-prefixes=CHECK,TYPES %s
 
 DWP from non-type-unit debug info for these two translation units:
 a.cpp: