[llvm] r370657 - [test] [llvm-dlltool] Improve test strictness a little. NFC.

[Martin Storsjo via llvm-commits]

Author: mstorsjo
Date: Mon Sep  2 06:28:21 2019
New Revision: 370657

URL: http://llvm.org/viewvc/llvm-project?rev=370657&view=rev
Log:
[test] [llvm-dlltool] Improve test strictness a little. NFC.

Modified:
    llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
    llvm/trunk/test/tools/llvm-dlltool/coff-exports.def
    llvm/trunk/test/tools/llvm-dlltool/coff-noname.def

Modified: llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def?rev=370657&r1=370656&r2=370657&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def (original)
+++ llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def Mon Sep  2 06:28:21 2019
@@ -13,26 +13,26 @@ StdcallExportName at 4=StdcallInternalFunct
 OtherStdcallExportName at 4=CdeclInternalFunction
 CdeclExportName=StdcallInternalFunction at 4
 
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__CdeclFunction
-; CHECK: Symbol: _CdeclFunction
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__StdcallFunction at 4
-; CHECK: Symbol: _StdcallFunction at 4
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp_ at FastcallFunction@4
-; CHECK: Symbol: @FastcallFunction at 4
-; CHECK: Name type: name
-; CHECK: Symbol: __imp_??_7exception@@6B@
-; CHECK: Symbol: ??_7exception@@6B@
+; CHECK:      Name type: noprefix
+; CHECK-NEXT: Symbol: __imp__CdeclFunction
+; CHECK-NEXT: Symbol: _CdeclFunction
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp__StdcallFunction at 4
+; CHECK-NEXT: Symbol: _StdcallFunction at 4
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp_ at FastcallFunction@4
+; CHECK-NEXT: Symbol: @FastcallFunction at 4
+; CHECK:      Name type: name
+; CHECK-NEXT: Symbol: __imp_??_7exception@@6B@
+; CHECK-NEXT: Symbol: ??_7exception@@6B@
 ; CHECK-NM: W _StdcallAlias at 4
 ; CHECK-NM: U _StdcallFunction at 4
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__StdcallExportName at 4{{$}}
-; CHECK: Symbol: _StdcallExportName at 4{{$}}
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__OtherStdcallExportName at 4{{$}}
-; CHECK: Symbol: _OtherStdcallExportName at 4{{$}}
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__CdeclExportName
-; CHECK: Symbol: _CdeclExportName
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp__StdcallExportName at 4{{$}}
+; CHECK-NEXT: Symbol: _StdcallExportName at 4{{$}}
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp__OtherStdcallExportName at 4{{$}}
+; CHECK-NEXT: Symbol: _OtherStdcallExportName at 4{{$}}
+; CHECK:      Name type: noprefix
+; CHECK-NEXT: Symbol: __imp__CdeclExportName
+; CHECK-NEXT: Symbol: _CdeclExportName

Modified: llvm/trunk/test/tools/llvm-dlltool/coff-exports.def
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dlltool/coff-exports.def?rev=370657&r1=370656&r2=370657&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-exports.def (original)
+++ llvm/trunk/test/tools/llvm-dlltool/coff-exports.def Mon Sep  2 06:28:21 2019
@@ -12,10 +12,12 @@ TestFunction3 ; This is a comment
 ; CHECK: File: test.dll
 ; CHECK: Format: COFF-import-file
 ; CHECK: Type: code
-; CHECK: Name type: name
-; CHECK: Symbol: __imp_TestFunction1
-; CHECK: Symbol: TestFunction1
-; CHECK: Symbol: __imp_TestFunction2{{$}}
-; CHECK: Symbol: TestFunction2{{$}}
-; CHECK: Symbol: __imp_TestFunction3{{$}}
-; CHECK: Symbol: TestFunction3{{$}}
+; CHECK:      Name type: name
+; CHECK-NEXT: Symbol: __imp_TestFunction1
+; CHECK-NEXT: Symbol: TestFunction1
+; CHECK:      Name type: name
+; CHECK-NEXT: Symbol: __imp_TestFunction2{{$}}
+; CHECK-NEXT: Symbol: TestFunction2{{$}}
+; CHECK:      Name type: name
+; CHECK-NEXT: Symbol: __imp_TestFunction3{{$}}
+; CHECK-NEXT: Symbol: TestFunction3{{$}}

Modified: llvm/trunk/test/tools/llvm-dlltool/coff-noname.def
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dlltool/coff-noname.def?rev=370657&r1=370656&r2=370657&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-noname.def (original)
+++ llvm/trunk/test/tools/llvm-dlltool/coff-noname.def Mon Sep  2 06:28:21 2019
@@ -6,9 +6,9 @@ EXPORTS
 ByOrdinalFunction @ 1 NONAME
 ByNameFunction
 
-; CHECK: Name type: ordinal
-; CHECK: Symbol: __imp__ByOrdinalFunction
-; CHECK: Symbol: _ByOrdinalFunction
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__ByNameFunction
-; CHECK: Symbol: _ByNameFunction
+; CHECK:      Name type: ordinal
+; CHECK-NEXT: Symbol: __imp__ByOrdinalFunction
+; CHECK-NEXT: Symbol: _ByOrdinalFunction
+; CHECK:      Name type: noprefix
+; CHECK-NEXT: Symbol: __imp__ByNameFunction
+; CHECK-NEXT: Symbol: _ByNameFunction