[llvm-dwp] Restructure inputs for test case so they're all grouped together

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254922 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-dwp/Inputs/simple/a.dwo b/test/tools/llvm-dwp/Inputs/simple/a.dwo
deleted file mode 100644 (file)
index 7bdb2a7..0000000
Binary files a/test/tools/llvm-dwp/Inputs/simple/a.dwo and /dev/null differ

diff --git a/test/tools/llvm-dwp/Inputs/simple/b.dwo b/test/tools/llvm-dwp/Inputs/simple/b.dwo
deleted file mode 100644 (file)
index f41243d..0000000
Binary files a/test/tools/llvm-dwp/Inputs/simple/b.dwo and /dev/null differ

diff --git a/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo b/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo
new file mode 100644 (file)
index 0000000..7bdb2a7
Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo differ

diff --git a/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo b/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo
new file mode 100644 (file)
index 0000000..f41243d
Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo differ

diff --git a/test/tools/llvm-dwp/Inputs/simple/types/a.dwo b/test/tools/llvm-dwp/Inputs/simple/types/a.dwo
new file mode 100644 (file)
index 0000000..1fc71ca
Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/simple/types/a.dwo differ

diff --git a/test/tools/llvm-dwp/Inputs/simple/types/b.dwo b/test/tools/llvm-dwp/Inputs/simple/types/b.dwo
new file mode 100644 (file)
index 0000000..a69cd69
Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/simple/types/b.dwo differ

diff --git a/test/tools/llvm-dwp/Inputs/type_units/a.dwo b/test/tools/llvm-dwp/Inputs/type_units/a.dwo
deleted file mode 100644 (file)
index 1fc71ca..0000000
Binary files a/test/tools/llvm-dwp/Inputs/type_units/a.dwo and /dev/null differ

diff --git a/test/tools/llvm-dwp/Inputs/type_units/b.dwo b/test/tools/llvm-dwp/Inputs/type_units/b.dwo
deleted file mode 100644 (file)
index a69cd69..0000000
Binary files a/test/tools/llvm-dwp/Inputs/type_units/b.dwo and /dev/null differ

diff --git a/test/tools/llvm-dwp/X86/simple.test b/test/tools/llvm-dwp/X86/simple.test
index 962e270a594e259f94874d1f4929b41734f920a6..d7365c81443522eb40b9a6b530c0669b809cee52 100644 (file)
--- a/test/tools/llvm-dwp/X86/simple.test
+++ b/test/tools/llvm-dwp/X86/simple.test
@@ -1,7 +1,7 @@
-RUN: llvm-dwp %p/../Inputs/simple/a.dwo %p/../Inputs/simple/b.dwo -o %t
+RUN: llvm-dwp %p/../Inputs/simple/notypes/a.dwo %p/../Inputs/simple/notypes/b.dwo -o %t
 RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
 RUN: llvm-objdump -h %t | FileCheck --check-prefix=NOTYPOBJ %s
-RUN: llvm-dwp %p/../Inputs/type_units/a.dwo %p/../Inputs/type_units/b.dwo -o %t
+RUN: llvm-dwp %p/../Inputs/simple/types/a.dwo %p/../Inputs/simple/types/b.dwo -o %t
 RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=TYPES %s
 
 FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.