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

[David Blaikie via llvm-commits]

Author: dblaikie
Date: Mon Dec  7 12:46:41 2015
New Revision: 254922

URL: http://llvm.org/viewvc/llvm-project?rev=254922&view=rev
Log:
[llvm-dwp] Restructure inputs for test case so they're all grouped together

Added:
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo
      - copied, changed from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo
      - copied, changed from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/a.dwo
      - copied, changed from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/b.dwo
      - copied, changed from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo
Removed:
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo
    llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo
Modified:
    llvm/trunk/test/tools/llvm-dwp/X86/simple.test

Removed: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo?rev=254921&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo (original) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo (removed) differ

Removed: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo?rev=254921&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo (original) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo (removed) differ

Copied: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo (from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo?p2=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/a.dwo&p1=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo&r1=254917&r2=254922&rev=254922&view=diff
==============================================================================
    (empty)

Copied: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo (from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo?p2=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/notypes/b.dwo&p1=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo&r1=254917&r2=254922&rev=254922&view=diff
==============================================================================
    (empty)

Copied: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/a.dwo (from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/a.dwo?p2=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/a.dwo&p1=llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo&r1=254917&r2=254922&rev=254922&view=diff
==============================================================================
    (empty)

Copied: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/b.dwo (from r254917, llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/b.dwo?p2=llvm/trunk/test/tools/llvm-dwp/Inputs/simple/types/b.dwo&p1=llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo&r1=254917&r2=254922&rev=254922&view=diff
==============================================================================
    (empty)

Removed: llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo?rev=254921&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo (original) and llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/a.dwo (removed) differ

Removed: llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo?rev=254921&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo (original) and llvm/trunk/test/tools/llvm-dwp/Inputs/type_units/b.dwo (removed) differ

Modified: llvm/trunk/test/tools/llvm-dwp/X86/simple.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/simple.test?rev=254922&r1=254921&r2=254922&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwp/X86/simple.test (original)
+++ llvm/trunk/test/tools/llvm-dwp/X86/simple.test Mon Dec  7 12:46:41 2015
@@ -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.