From f8a6223dd008c680193a723e685acbe46ea61836 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 7 Dec 2015 18:46:41 +0000 Subject: [PATCH] [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 --- .../llvm-dwp/Inputs/simple/{ => notypes}/a.dwo | Bin .../llvm-dwp/Inputs/simple/{ => notypes}/b.dwo | Bin .../Inputs/{type_units => simple/types}/a.dwo | Bin .../Inputs/{type_units => simple/types}/b.dwo | Bin test/tools/llvm-dwp/X86/simple.test | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename test/tools/llvm-dwp/Inputs/simple/{ => notypes}/a.dwo (100%) rename test/tools/llvm-dwp/Inputs/simple/{ => notypes}/b.dwo (100%) rename test/tools/llvm-dwp/Inputs/{type_units => simple/types}/a.dwo (100%) rename test/tools/llvm-dwp/Inputs/{type_units => simple/types}/b.dwo (100%) diff --git a/test/tools/llvm-dwp/Inputs/simple/a.dwo b/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo similarity index 100% rename from test/tools/llvm-dwp/Inputs/simple/a.dwo rename to test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo diff --git a/test/tools/llvm-dwp/Inputs/simple/b.dwo b/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo similarity index 100% rename from test/tools/llvm-dwp/Inputs/simple/b.dwo rename to test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo diff --git a/test/tools/llvm-dwp/Inputs/type_units/a.dwo b/test/tools/llvm-dwp/Inputs/simple/types/a.dwo similarity index 100% rename from test/tools/llvm-dwp/Inputs/type_units/a.dwo rename to test/tools/llvm-dwp/Inputs/simple/types/a.dwo diff --git a/test/tools/llvm-dwp/Inputs/type_units/b.dwo b/test/tools/llvm-dwp/Inputs/simple/types/b.dwo similarity index 100% rename from test/tools/llvm-dwp/Inputs/type_units/b.dwo rename to test/tools/llvm-dwp/Inputs/simple/types/b.dwo diff --git a/test/tools/llvm-dwp/X86/simple.test b/test/tools/llvm-dwp/X86/simple.test index 962e270a594..d7365c81443 100644 --- 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. -- 2.34.1