Skip to content

Commit 491fc23

Browse files
committed
[test] [llvm-dlltool] Improve test strictness a little. NFC.
llvm-svn: 370657
1 parent 1cec6b2 commit 491fc23

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

llvm/test/tools/llvm-dlltool/coff-decorated.def

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ StdcallExportName@4=StdcallInternalFunction@4
1313
OtherStdcallExportName@4=CdeclInternalFunction
1414
CdeclExportName=StdcallInternalFunction@4
1515

16-
; CHECK: Name type: noprefix
17-
; CHECK: Symbol: __imp__CdeclFunction
18-
; CHECK: Symbol: _CdeclFunction
19-
; CHECK: Name type: undecorate
20-
; CHECK: Symbol: __imp__StdcallFunction@4
21-
; CHECK: Symbol: _StdcallFunction@4
22-
; CHECK: Name type: undecorate
23-
; CHECK: Symbol: __imp_@FastcallFunction@4
24-
; CHECK: Symbol: @FastcallFunction@4
25-
; CHECK: Name type: name
26-
; CHECK: Symbol: __imp_??_7exception@@6B@
27-
; CHECK: Symbol: ??_7exception@@6B@
16+
; CHECK: Name type: noprefix
17+
; CHECK-NEXT: Symbol: __imp__CdeclFunction
18+
; CHECK-NEXT: Symbol: _CdeclFunction
19+
; CHECK: Name type: undecorate
20+
; CHECK-NEXT: Symbol: __imp__StdcallFunction@4
21+
; CHECK-NEXT: Symbol: _StdcallFunction@4
22+
; CHECK: Name type: undecorate
23+
; CHECK-NEXT: Symbol: __imp_@FastcallFunction@4
24+
; CHECK-NEXT: Symbol: @FastcallFunction@4
25+
; CHECK: Name type: name
26+
; CHECK-NEXT: Symbol: __imp_??_7exception@@6B@
27+
; CHECK-NEXT: Symbol: ??_7exception@@6B@
2828
; CHECK-NM: W _StdcallAlias@4
2929
; CHECK-NM: U _StdcallFunction@4
30-
; CHECK: Name type: undecorate
31-
; CHECK: Symbol: __imp__StdcallExportName@4{{$}}
32-
; CHECK: Symbol: _StdcallExportName@4{{$}}
33-
; CHECK: Name type: undecorate
34-
; CHECK: Symbol: __imp__OtherStdcallExportName@4{{$}}
35-
; CHECK: Symbol: _OtherStdcallExportName@4{{$}}
36-
; CHECK: Name type: noprefix
37-
; CHECK: Symbol: __imp__CdeclExportName
38-
; CHECK: Symbol: _CdeclExportName
30+
; CHECK: Name type: undecorate
31+
; CHECK-NEXT: Symbol: __imp__StdcallExportName@4{{$}}
32+
; CHECK-NEXT: Symbol: _StdcallExportName@4{{$}}
33+
; CHECK: Name type: undecorate
34+
; CHECK-NEXT: Symbol: __imp__OtherStdcallExportName@4{{$}}
35+
; CHECK-NEXT: Symbol: _OtherStdcallExportName@4{{$}}
36+
; CHECK: Name type: noprefix
37+
; CHECK-NEXT: Symbol: __imp__CdeclExportName
38+
; CHECK-NEXT: Symbol: _CdeclExportName

llvm/test/tools/llvm-dlltool/coff-exports.def

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ TestFunction3 ; This is a comment
1212
; CHECK: File: test.dll
1313
; CHECK: Format: COFF-import-file
1414
; CHECK: Type: code
15-
; CHECK: Name type: name
16-
; CHECK: Symbol: __imp_TestFunction1
17-
; CHECK: Symbol: TestFunction1
18-
; CHECK: Symbol: __imp_TestFunction2{{$}}
19-
; CHECK: Symbol: TestFunction2{{$}}
20-
; CHECK: Symbol: __imp_TestFunction3{{$}}
21-
; CHECK: Symbol: TestFunction3{{$}}
15+
; CHECK: Name type: name
16+
; CHECK-NEXT: Symbol: __imp_TestFunction1
17+
; CHECK-NEXT: Symbol: TestFunction1
18+
; CHECK: Name type: name
19+
; CHECK-NEXT: Symbol: __imp_TestFunction2{{$}}
20+
; CHECK-NEXT: Symbol: TestFunction2{{$}}
21+
; CHECK: Name type: name
22+
; CHECK-NEXT: Symbol: __imp_TestFunction3{{$}}
23+
; CHECK-NEXT: Symbol: TestFunction3{{$}}

llvm/test/tools/llvm-dlltool/coff-noname.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ EXPORTS
66
ByOrdinalFunction @ 1 NONAME
77
ByNameFunction
88

9-
; CHECK: Name type: ordinal
10-
; CHECK: Symbol: __imp__ByOrdinalFunction
11-
; CHECK: Symbol: _ByOrdinalFunction
12-
; CHECK: Name type: noprefix
13-
; CHECK: Symbol: __imp__ByNameFunction
14-
; CHECK: Symbol: _ByNameFunction
9+
; CHECK: Name type: ordinal
10+
; CHECK-NEXT: Symbol: __imp__ByOrdinalFunction
11+
; CHECK-NEXT: Symbol: _ByOrdinalFunction
12+
; CHECK: Name type: noprefix
13+
; CHECK-NEXT: Symbol: __imp__ByNameFunction
14+
; CHECK-NEXT: Symbol: _ByNameFunction

0 commit comments

Comments
 (0)