Move test yaml files under Inputs until they are converted to be the actual

test files.

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

diff --git a/test/Object/COFF/i386.yaml b/test/Object/COFF/i386.yaml
deleted file mode 100644 (file)
index ca90222..0000000
--- a/test/Object/COFF/i386.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-header: !Header
-  Machine: IMAGE_FILE_MACHINE_I386 # (0x14c)
-
-sections:
-  - !Section
-    Name: .text
-    Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
-    SectionData:  !hex "83EC0CC744240800000000C7042400000000E800000000E8000000008B44240883C40CC3" # |....D$.......$...............D$.....|
-
-    Relocations:
-      - !Relocation
-        VirtualAddress: 0xe
-        SymbolTableIndex: 5
-        Type: IMAGE_REL_I386_DIR32
-
-      - !Relocation
-        VirtualAddress: 0x13
-        SymbolTableIndex: 6
-        Type: IMAGE_REL_I386_REL32
-
-      - !Relocation
-        VirtualAddress: 0x18
-        SymbolTableIndex: 7
-        Type: IMAGE_REL_I386_REL32
-
-  - !Section
-    Name: .data
-    Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
-    SectionData:  !hex "48656C6C6F20576F726C642100" # |Hello World!.|
-
-symbols:
-  - !Symbol
-    Name: .text
-    Value: 0
-    SectionNumber: 1
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-    NumberOfAuxSymbols: 1
-    AuxillaryData:  !hex "240000000300000000000000010000000000" # |$.................|
-
-  - !Symbol
-    Name: .data
-    Value: 0
-    SectionNumber: 2
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-    NumberOfAuxSymbols: 1
-    AuxillaryData:  !hex "0D0000000000000000000000020000000000" # |..................|
-
-  - !Symbol
-    Name: _main
-    Value: 0
-    SectionNumber: 1
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_FUNCTION # (2)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-
-  - !Symbol
-    Name: L_.str
-    Value: 0
-    SectionNumber: 2
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-
-  - !Symbol
-    Name: _puts
-    Value: 0
-    SectionNumber: 0
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-
-  - !Symbol
-    Name: _SomeOtherFunction
-    Value: 0
-    SectionNumber: 0
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-

diff --git a/test/Object/COFF/x86-64.yaml b/test/Object/COFF/x86-64.yaml
deleted file mode 100644 (file)
index 0b1265f..0000000
--- a/test/Object/COFF/x86-64.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-header: !Header
-  Machine: IMAGE_FILE_MACHINE_AMD64 # (0x8664)
-
-sections:
-  - !Section
-    Name: .text
-    Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
-    SectionData:  !hex "4883EC28C744242400000000488D0D00000000E800000000E8000000008B4424244883C428C3" # |H..(.D$$....H.................D$$H..(.|
-
-    Relocations:
-      - !Relocation
-        VirtualAddress: 0xf
-        SymbolTableIndex: 5
-        Type: IMAGE_REL_AMD64_REL32
-
-      - !Relocation
-        VirtualAddress: 0x14
-        SymbolTableIndex: 6
-        Type: IMAGE_REL_AMD64_REL32
-
-      - !Relocation
-        VirtualAddress: 0x19
-        SymbolTableIndex: 7
-        Type: IMAGE_REL_AMD64_REL32
-
-  - !Section
-    Name: .data
-    Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
-    SectionData:  !hex "48656C6C6F20576F726C642100" # |Hello World!.|
-
-symbols:
-  - !Symbol
-    Name: .text
-    Value: 0
-    SectionNumber: 1
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-    NumberOfAuxSymbols: 1
-    AuxillaryData:  !hex "260000000300000000000000010000000000" # |&.................|
-
-  - !Symbol
-    Name: .data
-    Value: 0
-    SectionNumber: 2
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-    NumberOfAuxSymbols: 1
-    AuxillaryData:  !hex "0D0000000000000000000000020000000000" # |..................|
-
-  - !Symbol
-    Name: main
-    Value: 0
-    SectionNumber: 1
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_FUNCTION # (2)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-
-  - !Symbol
-    Name: L.str
-    Value: 0
-    SectionNumber: 2
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
-
-  - !Symbol
-    Name: puts
-    Value: 0
-    SectionNumber: 0
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-
-  - !Symbol
-    Name: SomeOtherFunction
-    Value: 0
-    SectionNumber: 0
-    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
-    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
-    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
-

diff --git a/test/Object/Inputs/COFF/i386.yaml b/test/Object/Inputs/COFF/i386.yaml
new file mode 100644 (file)
index 0000000..ca90222
--- /dev/null
+++ b/test/Object/Inputs/COFF/i386.yaml
@@ -0,0 +1,83 @@
+header: !Header
+  Machine: IMAGE_FILE_MACHINE_I386 # (0x14c)
+
+sections:
+  - !Section
+    Name: .text
+    Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
+    SectionData:  !hex "83EC0CC744240800000000C7042400000000E800000000E8000000008B44240883C40CC3" # |....D$.......$...............D$.....|
+
+    Relocations:
+      - !Relocation
+        VirtualAddress: 0xe
+        SymbolTableIndex: 5
+        Type: IMAGE_REL_I386_DIR32
+
+      - !Relocation
+        VirtualAddress: 0x13
+        SymbolTableIndex: 6
+        Type: IMAGE_REL_I386_REL32
+
+      - !Relocation
+        VirtualAddress: 0x18
+        SymbolTableIndex: 7
+        Type: IMAGE_REL_I386_REL32
+
+  - !Section
+    Name: .data
+    Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
+    SectionData:  !hex "48656C6C6F20576F726C642100" # |Hello World!.|
+
+symbols:
+  - !Symbol
+    Name: .text
+    Value: 0
+    SectionNumber: 1
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+    NumberOfAuxSymbols: 1
+    AuxillaryData:  !hex "240000000300000000000000010000000000" # |$.................|
+
+  - !Symbol
+    Name: .data
+    Value: 0
+    SectionNumber: 2
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+    NumberOfAuxSymbols: 1
+    AuxillaryData:  !hex "0D0000000000000000000000020000000000" # |..................|
+
+  - !Symbol
+    Name: _main
+    Value: 0
+    SectionNumber: 1
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_FUNCTION # (2)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+  - !Symbol
+    Name: L_.str
+    Value: 0
+    SectionNumber: 2
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+
+  - !Symbol
+    Name: _puts
+    Value: 0
+    SectionNumber: 0
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+  - !Symbol
+    Name: _SomeOtherFunction
+    Value: 0
+    SectionNumber: 0
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+

diff --git a/test/Object/Inputs/COFF/x86-64.yaml b/test/Object/Inputs/COFF/x86-64.yaml
new file mode 100644 (file)
index 0000000..0b1265f
--- /dev/null
+++ b/test/Object/Inputs/COFF/x86-64.yaml
@@ -0,0 +1,83 @@
+header: !Header
+  Machine: IMAGE_FILE_MACHINE_AMD64 # (0x8664)
+
+sections:
+  - !Section
+    Name: .text
+    Characteristics: [IMAGE_SCN_CNT_CODE, IMAGE_SCN_ALIGN_16BYTES, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ, ] # 0x60500020
+    SectionData:  !hex "4883EC28C744242400000000488D0D00000000E800000000E8000000008B4424244883C428C3" # |H..(.D$$....H.................D$$H..(.|
+
+    Relocations:
+      - !Relocation
+        VirtualAddress: 0xf
+        SymbolTableIndex: 5
+        Type: IMAGE_REL_AMD64_REL32
+
+      - !Relocation
+        VirtualAddress: 0x14
+        SymbolTableIndex: 6
+        Type: IMAGE_REL_AMD64_REL32
+
+      - !Relocation
+        VirtualAddress: 0x19
+        SymbolTableIndex: 7
+        Type: IMAGE_REL_AMD64_REL32
+
+  - !Section
+    Name: .data
+    Characteristics: [IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_ALIGN_1BYTES, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE, ] # 0xc0100040
+    SectionData:  !hex "48656C6C6F20576F726C642100" # |Hello World!.|
+
+symbols:
+  - !Symbol
+    Name: .text
+    Value: 0
+    SectionNumber: 1
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+    NumberOfAuxSymbols: 1
+    AuxillaryData:  !hex "260000000300000000000000010000000000" # |&.................|
+
+  - !Symbol
+    Name: .data
+    Value: 0
+    SectionNumber: 2
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+    NumberOfAuxSymbols: 1
+    AuxillaryData:  !hex "0D0000000000000000000000020000000000" # |..................|
+
+  - !Symbol
+    Name: main
+    Value: 0
+    SectionNumber: 1
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_FUNCTION # (2)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+  - !Symbol
+    Name: L.str
+    Value: 0
+    SectionNumber: 2
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_STATIC # (3)
+
+  - !Symbol
+    Name: puts
+    Value: 0
+    SectionNumber: 0
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+
+  - !Symbol
+    Name: SomeOtherFunction
+    Value: 0
+    SectionNumber: 0
+    SimpleType: IMAGE_SYM_TYPE_NULL # (0)
+    ComplexType: IMAGE_SYM_DTYPE_NULL # (0)
+    StorageClass: IMAGE_SYM_CLASS_EXTERNAL # (2)
+

diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test
index b6f70a02a7a59dfa38d0428bdb15080ae1a2f9a1..8fd1c0482de9af622edf9807bab3a3db45f941df 100644 (file)
--- a/test/Object/nm-trivial-object.test
+++ b/test/Object/nm-trivial-object.test
@@ -1,5 +1,7 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-nm | FileCheck %s -check-prefix COFF
-RUN: yaml2obj %p/COFF/x86-64.yaml | llvm-nm | FileCheck %s -check-prefix COFF
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-nm \
+RUN:         | FileCheck %s -check-prefix COFF
+RUN: yaml2obj %p/Inputs/COFF/x86-64.yaml | llvm-nm \
+RUN          | FileCheck %s -check-prefix COFF
 RUN: llvm-nm %p/Inputs/trivial-object-test.elf-i386 \
 RUN:         | FileCheck %s -check-prefix ELF
 RUN: llvm-nm %p/Inputs/trivial-object-test.elf-x86-64 \

diff --git a/test/Object/objdump-file-header.test b/test/Object/objdump-file-header.test
index f35a8a1fa202cce8ee9c4006f9504c62355200e0..a552113d32534a0142860c59da121cb58062a33b 100644 (file)
--- a/test/Object/objdump-file-header.test
+++ b/test/Object/objdump-file-header.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -f - | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -f %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
 

diff --git a/test/Object/objdump-section-content.test b/test/Object/objdump-section-content.test
index 56b7989a605ca298f0c9c95c0acd25b6f193dd6e..f9c4f43f0be0ff145f858e1bee5d6ddcf3152a32 100644 (file)
--- a/test/Object/objdump-section-content.test
+++ b/test/Object/objdump-section-content.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -s - | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -s %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
 

diff --git a/test/Object/objdump-symbol-table.test b/test/Object/objdump-symbol-table.test
index a721171c094fa02708fd807a4fe68c27d0af7831..989ec04a8ddc33cc3d55a721467d70984982f4f6 100644 (file)
--- a/test/Object/objdump-symbol-table.test
+++ b/test/Object/objdump-symbol-table.test
@@ -1,4 +1,4 @@
-RUN: yaml2obj %p/COFF/i386.yaml | llvm-objdump -t - \
+RUN: yaml2obj %p/Inputs/COFF/i386.yaml | llvm-objdump -t - \
 RUN:              | FileCheck %s -check-prefix COFF-i386
 RUN: llvm-objdump -t %p/Inputs/trivial-object-test.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
@@ -30,4 +30,4 @@ macho-i386: trivial-object-test.macho-i386:        file format Mach-O 32-bit i38
 macho-i386: SYMBOL TABLE:
 macho-i386: 00000000 g     F __TEXT,__text  00000024 _main
 macho-i386: 00000000         *UND*  00000000 _SomeOtherFunction
-macho-i386: 00000000         *UND*  00000000 _puts
\ No newline at end of file
+macho-i386: 00000000         *UND*  00000000 _puts