[llvm-commits] [llvm] r161219 - in /llvm/trunk/test/Object: COFF/i386.yaml COFF/x86-64.yaml Inputs/COFF/ Inputs/COFF/i386.yaml Inputs/COFF/x86-64.yaml nm-trivial-object.test objdump-file-header.test objdump-section-content.test objdump-symbol-table.test
Matt Beaumont-Gay
matthewbg at google.com
Thu Aug 2 14:52:49 PDT 2012
Author: matthewbg
Date: Thu Aug 2 16:52:49 2012
New Revision: 161219
URL: http://llvm.org/viewvc/llvm-project?rev=161219&view=rev
Log:
Move test yaml files under Inputs until they are converted to be the actual
test files.
Added:
llvm/trunk/test/Object/Inputs/COFF/
llvm/trunk/test/Object/Inputs/COFF/i386.yaml
- copied, changed from r161207, llvm/trunk/test/Object/COFF/i386.yaml
llvm/trunk/test/Object/Inputs/COFF/x86-64.yaml
- copied, changed from r161207, llvm/trunk/test/Object/COFF/x86-64.yaml
Removed:
llvm/trunk/test/Object/COFF/i386.yaml
llvm/trunk/test/Object/COFF/x86-64.yaml
Modified:
llvm/trunk/test/Object/nm-trivial-object.test
llvm/trunk/test/Object/objdump-file-header.test
llvm/trunk/test/Object/objdump-section-content.test
llvm/trunk/test/Object/objdump-symbol-table.test
Removed: llvm/trunk/test/Object/COFF/i386.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/COFF/i386.yaml?rev=161218&view=auto
==============================================================================
--- llvm/trunk/test/Object/COFF/i386.yaml (original)
+++ llvm/trunk/test/Object/COFF/i386.yaml (removed)
@@ -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)
-
Removed: llvm/trunk/test/Object/COFF/x86-64.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/COFF/x86-64.yaml?rev=161218&view=auto
==============================================================================
--- llvm/trunk/test/Object/COFF/x86-64.yaml (original)
+++ llvm/trunk/test/Object/COFF/x86-64.yaml (removed)
@@ -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)
-
Copied: llvm/trunk/test/Object/Inputs/COFF/i386.yaml (from r161207, llvm/trunk/test/Object/COFF/i386.yaml)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/COFF/i386.yaml?p2=llvm/trunk/test/Object/Inputs/COFF/i386.yaml&p1=llvm/trunk/test/Object/COFF/i386.yaml&r1=161207&r2=161219&rev=161219&view=diff
==============================================================================
(empty)
Copied: llvm/trunk/test/Object/Inputs/COFF/x86-64.yaml (from r161207, llvm/trunk/test/Object/COFF/x86-64.yaml)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/COFF/x86-64.yaml?p2=llvm/trunk/test/Object/Inputs/COFF/x86-64.yaml&p1=llvm/trunk/test/Object/COFF/x86-64.yaml&r1=161207&r2=161219&rev=161219&view=diff
==============================================================================
(empty)
Modified: llvm/trunk/test/Object/nm-trivial-object.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-trivial-object.test?rev=161219&r1=161218&r2=161219&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test (original)
+++ llvm/trunk/test/Object/nm-trivial-object.test Thu Aug 2 16:52:49 2012
@@ -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 \
Modified: llvm/trunk/test/Object/objdump-file-header.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/objdump-file-header.test?rev=161219&r1=161218&r2=161219&view=diff
==============================================================================
--- llvm/trunk/test/Object/objdump-file-header.test (original)
+++ llvm/trunk/test/Object/objdump-file-header.test Thu Aug 2 16:52:49 2012
@@ -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
Modified: llvm/trunk/test/Object/objdump-section-content.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/objdump-section-content.test?rev=161219&r1=161218&r2=161219&view=diff
==============================================================================
--- llvm/trunk/test/Object/objdump-section-content.test (original)
+++ llvm/trunk/test/Object/objdump-section-content.test Thu Aug 2 16:52:49 2012
@@ -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
Modified: llvm/trunk/test/Object/objdump-symbol-table.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/objdump-symbol-table.test?rev=161219&r1=161218&r2=161219&view=diff
==============================================================================
--- llvm/trunk/test/Object/objdump-symbol-table.test (original)
+++ llvm/trunk/test/Object/objdump-symbol-table.test Thu Aug 2 16:52:49 2012
@@ -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: 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
More information about the llvm-commits
mailing list