[lld] r238670 - COFF: Remove redundant options from tests.
Rui Ueyama
ruiu at google.com
Sat May 30 21:21:31 PDT 2015
Author: ruiu
Date: Sat May 30 23:21:30 2015
New Revision: 238670
URL: http://llvm.org/viewvc/llvm-project?rev=238670&view=rev
Log:
COFF: Remove redundant options from tests.
Added:
lld/trunk/test/COFF/Inputs/ret42.yaml
- copied, changed from r238669, lld/trunk/test/COFF/long-section-name.test
Modified:
lld/trunk/test/COFF/base.test
lld/trunk/test/COFF/heap.test
lld/trunk/test/COFF/long-section-name.test
lld/trunk/test/COFF/stack.test
lld/trunk/test/COFF/version.test
Copied: lld/trunk/test/COFF/Inputs/ret42.yaml (from r238669, lld/trunk/test/COFF/long-section-name.test)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/ret42.yaml?p2=lld/trunk/test/COFF/Inputs/ret42.yaml&p1=lld/trunk/test/COFF/long-section-name.test&r1=238669&r2=238670&rev=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/long-section-name.test (original)
+++ lld/trunk/test/COFF/Inputs/ret42.yaml Sat May 30 23:21:30 2015
@@ -1,28 +1,18 @@
-# RUN: yaml2obj %s > %t.obj
-# RUN: lld -flavor link2 /out:%t.exe /subsystem:console %t.obj
-# RUN: llvm-readobj -sections %t.exe | FileCheck %s
-
---
header:
- Machine: IMAGE_FILE_MACHINE_I386
- Characteristics: [ ]
+ Machine: IMAGE_FILE_MACHINE_AMD64
+ Characteristics: []
sections:
- - Name: .text_long_section_name
+ - Name: '.text$mn'
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
- Alignment: 4
+ Alignment: 16
SectionData: B82A000000C3
- - Name: .data_long_section_name
+ - Name: .data
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
- Alignment: 4
- SectionData: "00"
+ Alignment: 16
+ SectionData: ''
symbols:
- - Name: "@comp.id"
- Value: 10394907
- SectionNumber: 65535
- SimpleType: IMAGE_SYM_TYPE_NULL
- ComplexType: IMAGE_SYM_DTYPE_NULL
- StorageClass: IMAGE_SYM_CLASS_STATIC
- - Name: .text_long_section_name
+ - Name: '.text$mn'
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
@@ -34,7 +24,7 @@ symbols:
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- - Name: .data_long_section_name
+ - Name: .data
Value: 0
SectionNumber: 2
SimpleType: IMAGE_SYM_TYPE_NULL
@@ -50,9 +40,6 @@ symbols:
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
- ComplexType: IMAGE_SYM_DTYPE_NULL
+ ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...
-
-# CHECK: Name: .data_long_section_name
-# CHECK: Name: .text_long_section_name
Modified: lld/trunk/test/COFF/base.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/base.test?rev=238670&r1=238669&r2=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/base.test (original)
+++ lld/trunk/test/COFF/base.test Sat May 30 23:21:30 2015
@@ -1,11 +1,11 @@
-# RUN: lld -flavor link2 /entry:main /out:%t.exe /subsystem:console \
-# RUN: %p/Inputs/ret42.obj
+# RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
+
+# RUN: lld -flavor link2 /out:%t.exe %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
DEFAULT: ImageBase: 0x140000000
-# RUN: lld -flavor link2 /entry:main /out:%t.exe /subsystem:console \
-# RUN: /base:0x280000000 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj /base:0x280000000
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=BASE %s
BASE: ImageBase: 0x280000000
Modified: lld/trunk/test/COFF/heap.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/heap.test?rev=238670&r1=238669&r2=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/heap.test (original)
+++ lld/trunk/test/COFF/heap.test Sat May 30 23:21:30 2015
@@ -1,19 +1,18 @@
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: %p/Inputs/ret42.obj
+# RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
+
+# RUN: lld -flavor link2 /out:%t.exe %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
DEFAULT: SizeOfHeapReserve: 1048576
DEFAULT: SizeOfHeapCommit: 4096
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /heap:0x3000 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe /heap:0x3000 %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
CHECK1: SizeOfHeapReserve: 12288
CHECK1: SizeOfHeapCommit: 4096
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /heap:0x5000,0x3000 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe /heap:0x5000,0x3000 %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
CHECK2: SizeOfHeapReserve: 20480
Modified: lld/trunk/test/COFF/long-section-name.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/long-section-name.test?rev=238670&r1=238669&r2=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/long-section-name.test (original)
+++ lld/trunk/test/COFF/long-section-name.test Sat May 30 23:21:30 2015
@@ -1,5 +1,5 @@
-# RUN: yaml2obj %s > %t.obj
-# RUN: lld -flavor link2 /out:%t.exe /subsystem:console %t.obj
+# RUN: yaml2obj < %s > %t.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj
# RUN: llvm-readobj -sections %t.exe | FileCheck %s
---
Modified: lld/trunk/test/COFF/stack.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/stack.test?rev=238670&r1=238669&r2=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/stack.test (original)
+++ lld/trunk/test/COFF/stack.test Sat May 30 23:21:30 2015
@@ -1,19 +1,18 @@
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: %p/Inputs/ret42.obj
+# RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
+
+# RUN: lld -flavor link2 /out:%t.exe %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
DEFAULT: SizeOfStackReserve: 1048576
DEFAULT: SizeOfStackCommit: 4096
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /stack:0x3000 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj /stack:0x3000
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
CHECK1: SizeOfStackReserve: 12288
CHECK1: SizeOfStackCommit: 4096
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /stack:0x5000,0x3000 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj /stack:0x5000,0x3000
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
CHECK2: SizeOfStackReserve: 20480
Modified: lld/trunk/test/COFF/version.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/version.test?rev=238670&r1=238669&r2=238670&view=diff
==============================================================================
--- lld/trunk/test/COFF/version.test (original)
+++ lld/trunk/test/COFF/version.test Sat May 30 23:21:30 2015
@@ -1,19 +1,18 @@
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: %p/Inputs/ret42.obj
+# RUN: yaml2obj < %p/Inputs/ret42.yaml > %t.obj
+
+# RUN: lld -flavor link2 /out:%t.exe %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=DEFAULT %s
DEFAULT: MajorImageVersion: 0
DEFAULT: MinorImageVersion: 0
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /version:11 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj /version:11
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK1 %s
CHECK1: MajorImageVersion: 11
CHECK1: MinorImageVersion: 0
-# RUN: lld -flavor link2 /entry:main /subsystem:console /out:%t.exe \
-# RUN: /version:11.22 %p/Inputs/ret42.obj
+# RUN: lld -flavor link2 /out:%t.exe %t.obj /version:11.22
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
CHECK2: MajorImageVersion: 11
More information about the llvm-commits
mailing list