[lld] r200275 - [PECOFF] Remove a redundant test.

Rui Ueyama ruiu at google.com
Mon Jan 27 17:36:13 PST 2014


Author: ruiu
Date: Mon Jan 27 19:36:13 2014
New Revision: 200275

URL: http://llvm.org/viewvc/llvm-project?rev=200275&view=rev
Log:
[PECOFF] Remove a redundant test.

peplus.test and pe32plus.test basically covered the same thing, so
remove pe32plus.test and then rename peplus.test -> pe32plus.test.

Removed:
    lld/trunk/test/pecoff/peplus.test
Modified:
    lld/trunk/test/pecoff/pe32plus.test

Modified: lld/trunk/test/pecoff/pe32plus.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/pe32plus.test?rev=200275&r1=200274&r2=200275&view=diff
==============================================================================
--- lld/trunk/test/pecoff/pe32plus.test (original)
+++ lld/trunk/test/pecoff/pe32plus.test Mon Jan 27 19:36:13 2014
@@ -1,7 +1,87 @@
-# RUN: yaml2obj %p/Inputs/nop.obj.yaml > %t.obj
-#
-# RUN: lld -flavor link /machine:x64 /out:%t.exe /subsystem:console /force \
-# RUN:   -- %t.obj
+# RUN: yaml2obj %p/Inputs/nop64.obj.yaml > %t.obj
+
+# RUN: lld -flavor link /out:%t.exe /subsystem:console /machine:x64 \
+# RUN:   /entry:start -- %t.obj
 # RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
 
-CHECK: Format: COFF-x86-64
+CHECK:      Format: COFF-x86-64
+CHECK-NEXT: Arch: x86_64
+CHECK-NEXT: AddressSize: 64bit
+CHECK-NEXT: ImageFileHeader {
+CHECK-NEXT:   Machine: IMAGE_FILE_MACHINE_AMD64 (0x8664)
+CHECK-NEXT:   SectionCount: 3
+CHECK-NEXT:   TimeDateStamp:
+CHECK-NEXT:   PointerToSymbolTable: 0x0
+CHECK-NEXT:   SymbolCount: 0
+CHECK-NEXT:   OptionalHeaderSize: 240
+CHECK-NEXT:   Characteristics [ (0x102)
+CHECK-NEXT:     IMAGE_FILE_32BIT_MACHINE (0x100)
+CHECK-NEXT:     IMAGE_FILE_EXECUTABLE_IMAGE (0x2)
+CHECK-NEXT:   ]
+CHECK-NEXT: }
+CHECK-NEXT: ImageOptionalHeader {
+CHECK-NEXT:   MajorLinkerVersion: 0
+CHECK-NEXT:   MinorLinkerVersion: 0
+CHECK-NEXT:   SizeOfCode: 1
+CHECK-NEXT:   SizeOfInitializedData: 108
+CHECK-NEXT:   SizeOfUninitializedData: 0
+CHECK-NEXT:   AddressOfEntryPoint: 0x2000
+CHECK-NEXT:   BaseOfCode: 0x2000
+CHECK-NEXT:   ImageBase: 0x400000
+CHECK-NEXT:   SectionAlignment: 4096
+CHECK-NEXT:   FileAlignment: 512
+CHECK-NEXT:   MajorOperatingSystemVersion: 6
+CHECK-NEXT:   MinorOperatingSystemVersion: 0
+CHECK-NEXT:   MajorImageVersion: 0
+CHECK-NEXT:   MinorImageVersion: 0
+CHECK-NEXT:   MajorSubsystemVersion: 6
+CHECK-NEXT:   MinorSubsystemVersion: 0
+CHECK-NEXT:   SizeOfImage: 12288
+CHECK-NEXT:   SizeOfHeaders: 512
+CHECK-NEXT:   Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
+CHECK-NEXT:   Subsystem [ (0x8540)
+CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE (0x40)
+CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_NO_SEH (0x400)
+CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_NX_COMPAT (0x100)
+CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE (0x8000)
+CHECK-NEXT:   ]
+CHECK-NEXT:   SizeOfStackReserve: 1048576
+CHECK-NEXT:   SizeOfStackCommit: 4096
+CHECK-NEXT:   SizeOfHeapReserve: 1048576
+CHECK-NEXT:   SizeOfHeapCommit: 4096
+CHECK-NEXT:   NumberOfRvaAndSize: 16
+CHECK-NEXT:   DataDirectory {
+CHECK-NEXT:     ExportTableRVA: 0x0
+CHECK-NEXT:     ExportTableSize: 0x0
+CHECK-NEXT:     ImportTableRVA: 0x0
+CHECK-NEXT:     ImportTableSize: 0x0
+CHECK-NEXT:     ResourceTableRVA: 0x0
+CHECK-NEXT:     ResourceTableSize: 0x0
+CHECK-NEXT:     ExceptionTableRVA: 0x0
+CHECK-NEXT:     ExceptionTableSize: 0x0
+CHECK-NEXT:     CertificateTableRVA: 0x0
+CHECK-NEXT:     CertificateTableSize: 0x0
+CHECK-NEXT:     BaseRelocationTableRVA: 0x0
+CHECK-NEXT:     BaseRelocationTableSize: 0x0
+CHECK-NEXT:     DebugRVA: 0x0
+CHECK-NEXT:     DebugSize: 0x0
+CHECK-NEXT:     ArchitectureRVA: 0x0
+CHECK-NEXT:     ArchitectureSize: 0x0
+CHECK-NEXT:     GlobalPtrRVA: 0x0
+CHECK-NEXT:     GlobalPtrSize: 0x0
+CHECK-NEXT:     TLSTableRVA: 0x0
+CHECK-NEXT:     TLSTableSize: 0x0
+CHECK-NEXT:     LoadConfigTableRVA: 0x0
+CHECK-NEXT:     LoadConfigTableSize: 0x0
+CHECK-NEXT:     BoundImportRVA: 0x0
+CHECK-NEXT:     BoundImportSize: 0x0
+CHECK-NEXT:     IATRVA: 0x0
+CHECK-NEXT:     IATSize: 0x0
+CHECK-NEXT:     DelayImportDescriptorRVA: 0x0
+CHECK-NEXT:     DelayImportDescriptorSize: 0x0
+CHECK-NEXT:     CLRRuntimeHeaderRVA: 0x0
+CHECK-NEXT:     CLRRuntimeHeaderSize: 0x0
+CHECK-NEXT:     ReservedRVA: 0x0
+CHECK-NEXT:     ReservedSize: 0x0
+CHECK-NEXT:   }
+CHECK-NEXT: }

Removed: lld/trunk/test/pecoff/peplus.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/peplus.test?rev=200274&view=auto
==============================================================================
--- lld/trunk/test/pecoff/peplus.test (original)
+++ lld/trunk/test/pecoff/peplus.test (removed)
@@ -1,87 +0,0 @@
-# RUN: yaml2obj %p/Inputs/nop64.obj.yaml > %t.obj
-
-# RUN: lld -flavor link /out:%t.exe /subsystem:console /machine:x64 \
-# RUN:   /entry:start -- %t.obj
-# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
-
-CHECK:      Format: COFF-x86-64
-CHECK-NEXT: Arch: x86_64
-CHECK-NEXT: AddressSize: 64bit
-CHECK-NEXT: ImageFileHeader {
-CHECK-NEXT:   Machine: IMAGE_FILE_MACHINE_AMD64 (0x8664)
-CHECK-NEXT:   SectionCount: 3
-CHECK-NEXT:   TimeDateStamp:
-CHECK-NEXT:   PointerToSymbolTable: 0x0
-CHECK-NEXT:   SymbolCount: 0
-CHECK-NEXT:   OptionalHeaderSize: 240
-CHECK-NEXT:   Characteristics [ (0x102)
-CHECK-NEXT:     IMAGE_FILE_32BIT_MACHINE (0x100)
-CHECK-NEXT:     IMAGE_FILE_EXECUTABLE_IMAGE (0x2)
-CHECK-NEXT:   ]
-CHECK-NEXT: }
-CHECK-NEXT: ImageOptionalHeader {
-CHECK-NEXT:   MajorLinkerVersion: 0
-CHECK-NEXT:   MinorLinkerVersion: 0
-CHECK-NEXT:   SizeOfCode: 1
-CHECK-NEXT:   SizeOfInitializedData: 108
-CHECK-NEXT:   SizeOfUninitializedData: 0
-CHECK-NEXT:   AddressOfEntryPoint: 0x2000
-CHECK-NEXT:   BaseOfCode: 0x2000
-CHECK-NEXT:   ImageBase: 0x400000
-CHECK-NEXT:   SectionAlignment: 4096
-CHECK-NEXT:   FileAlignment: 512
-CHECK-NEXT:   MajorOperatingSystemVersion: 6
-CHECK-NEXT:   MinorOperatingSystemVersion: 0
-CHECK-NEXT:   MajorImageVersion: 0
-CHECK-NEXT:   MinorImageVersion: 0
-CHECK-NEXT:   MajorSubsystemVersion: 6
-CHECK-NEXT:   MinorSubsystemVersion: 0
-CHECK-NEXT:   SizeOfImage: 12288
-CHECK-NEXT:   SizeOfHeaders: 512
-CHECK-NEXT:   Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
-CHECK-NEXT:   Subsystem [ (0x8540)
-CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE (0x40)
-CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_NO_SEH (0x400)
-CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_NX_COMPAT (0x100)
-CHECK-NEXT:     IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE (0x8000)
-CHECK-NEXT:   ]
-CHECK-NEXT:   SizeOfStackReserve: 1048576
-CHECK-NEXT:   SizeOfStackCommit: 4096
-CHECK-NEXT:   SizeOfHeapReserve: 1048576
-CHECK-NEXT:   SizeOfHeapCommit: 4096
-CHECK-NEXT:   NumberOfRvaAndSize: 16
-CHECK-NEXT:   DataDirectory {
-CHECK-NEXT:     ExportTableRVA: 0x0
-CHECK-NEXT:     ExportTableSize: 0x0
-CHECK-NEXT:     ImportTableRVA: 0x0
-CHECK-NEXT:     ImportTableSize: 0x0
-CHECK-NEXT:     ResourceTableRVA: 0x0
-CHECK-NEXT:     ResourceTableSize: 0x0
-CHECK-NEXT:     ExceptionTableRVA: 0x0
-CHECK-NEXT:     ExceptionTableSize: 0x0
-CHECK-NEXT:     CertificateTableRVA: 0x0
-CHECK-NEXT:     CertificateTableSize: 0x0
-CHECK-NEXT:     BaseRelocationTableRVA: 0x0
-CHECK-NEXT:     BaseRelocationTableSize: 0x0
-CHECK-NEXT:     DebugRVA: 0x0
-CHECK-NEXT:     DebugSize: 0x0
-CHECK-NEXT:     ArchitectureRVA: 0x0
-CHECK-NEXT:     ArchitectureSize: 0x0
-CHECK-NEXT:     GlobalPtrRVA: 0x0
-CHECK-NEXT:     GlobalPtrSize: 0x0
-CHECK-NEXT:     TLSTableRVA: 0x0
-CHECK-NEXT:     TLSTableSize: 0x0
-CHECK-NEXT:     LoadConfigTableRVA: 0x0
-CHECK-NEXT:     LoadConfigTableSize: 0x0
-CHECK-NEXT:     BoundImportRVA: 0x0
-CHECK-NEXT:     BoundImportSize: 0x0
-CHECK-NEXT:     IATRVA: 0x0
-CHECK-NEXT:     IATSize: 0x0
-CHECK-NEXT:     DelayImportDescriptorRVA: 0x0
-CHECK-NEXT:     DelayImportDescriptorSize: 0x0
-CHECK-NEXT:     CLRRuntimeHeaderRVA: 0x0
-CHECK-NEXT:     CLRRuntimeHeaderSize: 0x0
-CHECK-NEXT:     ReservedRVA: 0x0
-CHECK-NEXT:     ReservedSize: 0x0
-CHECK-NEXT:   }
-CHECK-NEXT: }





More information about the llvm-commits mailing list