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

llvm-svn: 254922

diff --git a/llvm/test/tools/llvm-dwp/Inputs/simple/a.dwo b/llvm/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo
similarity index 100%
rename from llvm/test/tools/llvm-dwp/Inputs/simple/a.dwo
rename to llvm/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo

diff --git a/llvm/test/tools/llvm-dwp/Inputs/simple/b.dwo b/llvm/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo
similarity index 100%
rename from llvm/test/tools/llvm-dwp/Inputs/simple/b.dwo
rename to llvm/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo

diff --git a/llvm/test/tools/llvm-dwp/Inputs/type_units/a.dwo b/llvm/test/tools/llvm-dwp/Inputs/simple/types/a.dwo
similarity index 100%
rename from llvm/test/tools/llvm-dwp/Inputs/type_units/a.dwo
rename to llvm/test/tools/llvm-dwp/Inputs/simple/types/a.dwo

diff --git a/llvm/test/tools/llvm-dwp/Inputs/type_units/b.dwo b/llvm/test/tools/llvm-dwp/Inputs/simple/types/b.dwo
similarity index 100%
rename from llvm/test/tools/llvm-dwp/Inputs/type_units/b.dwo
rename to llvm/test/tools/llvm-dwp/Inputs/simple/types/b.dwo

diff --git a/llvm/test/tools/llvm-dwp/X86/simple.test b/llvm/test/tools/llvm-dwp/X86/simple.test
index 962e270..d7365c8 100644 (file)
--- a/llvm/test/tools/llvm-dwp/X86/simple.test
+++ b/llvm/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.