Skip to content

Commit 421f15d

Browse files
authored
[llvm-readobj][COFF] Improve extended DLL characteristics test (#151978)
Remove the need for the input binary by replacing it with a yaml2obj-generated file.
1 parent 9b2b5bf commit 421f15d

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed
Binary file not shown.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--- !COFF
2+
OptionalHeader:
3+
AddressOfEntryPoint: 0
4+
ImageBase: 0x180000000
5+
SectionAlignment: 4096
6+
FileAlignment: 512
7+
MajorOperatingSystemVersion: 6
8+
MinorOperatingSystemVersion: 0
9+
MajorImageVersion: 0
10+
MinorImageVersion: 0
11+
MajorSubsystemVersion: 6
12+
MinorSubsystemVersion: 0
13+
Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
14+
DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ]
15+
SizeOfStackReserve: 1048576
16+
SizeOfStackCommit: 4096
17+
SizeOfHeapReserve: 1048576
18+
SizeOfHeapCommit: 4096
19+
Debug:
20+
RelativeVirtualAddress: 8192
21+
Size: 56
22+
header:
23+
Machine: IMAGE_FILE_MACHINE_AMD64
24+
Characteristics: [ IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_DLL, IMAGE_FILE_LARGE_ADDRESS_AWARE ]
25+
sections:
26+
- Name: .rdata
27+
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
28+
VirtualAddress: 8192
29+
VirtualSize: 180
30+
SectionData: 0000000091BE906800000000020000005500000058200000580400000000000091BE9068000000001400000004000000B0200000B0040000180000000380038000000000000000005020000008000000101000000300000052534453867E6BCADB53244591DEC582FAB540DB10000000433A5C55736572735C73756E675C446F63756D656E74735C636F64655C636574657865635C7836345C52656C656173655C636574657865632E706462000000008F000000
31+
SizeOfRawData: 512
32+
symbols: []
33+
...

llvm/test/tools/llvm-readobj/COFF/exdllcharacteristics.test

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# To regenerate has-exdllcharacteristics.exe
22
# $ echo int main() { return 0; } > has-exdllcharacteristics.c
3-
# To make minimum possible stub file (to decrease the binary size)
4-
# $ echo -n '4D5A00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' | xxd -r -p > stub
5-
# $ cl has-exdllcharacteristics.c /link /entry:main /STUB:stub /NOCOFFGRPINFO /EMITTOOLVERSIONINFO:NO /EMITPOGOPHASEINFO /NOVCFEATURE /MANIFEST:NO /cetcompat /cetcompatstrict /cetdynamicapisinproc /cetipvalidationrelaxed /hotpatchcompatible /functionpadmin:6
6-
RUN: llvm-readobj --coff-debug-directory %p/Inputs/has-exdllcharacteristics.exe | FileCheck %s
3+
# $ cl has-exdllcharacteristics.c /link /entry:main /cetcompat /cetcompatstrict /cetdynamicapisinproc /cetipvalidationrelaxed /hotpatchcompatible /functionpadmin:6
4+
RUN: yaml2obj %p/Inputs/has-exdllcharacteristics.yaml > %t.exe
5+
RUN: llvm-readobj --coff-debug-directory %t.exe | FileCheck %s
76

87
CHECK: DebugEntry {
98
CHECK: Characteristics: 0x0

0 commit comments

Comments
 (0)