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

llvm-svn: 370657

diff --git a/llvm/test/tools/llvm-dlltool/coff-decorated.def b/llvm/test/tools/llvm-dlltool/coff-decorated.def
index 42adea9..8568046 100644 (file)
--- a/llvm/test/tools/llvm-dlltool/coff-decorated.def
+++ b/llvm/test/tools/llvm-dlltool/coff-decorated.def
@@ -13,26 +13,26 @@ StdcallExportName@4=StdcallInternalFunction@4
 OtherStdcallExportName@4=CdeclInternalFunction
 CdeclExportName=StdcallInternalFunction@4
 
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__CdeclFunction
-; CHECK: Symbol: _CdeclFunction
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__StdcallFunction@4
-; CHECK: Symbol: _StdcallFunction@4
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp_@FastcallFunction@4
-; CHECK: Symbol: @FastcallFunction@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@4
+; CHECK-NEXT: Symbol: _StdcallFunction@4
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp_@FastcallFunction@4
+; CHECK-NEXT: Symbol: @FastcallFunction@4
+; CHECK:      Name type: name
+; CHECK-NEXT: Symbol: __imp_??_7exception@@6B@
+; CHECK-NEXT: Symbol: ??_7exception@@6B@
 ; CHECK-NM: W _StdcallAlias@4
 ; CHECK-NM: U _StdcallFunction@4
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__StdcallExportName@4{{$}}
-; CHECK: Symbol: _StdcallExportName@4{{$}}
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__OtherStdcallExportName@4{{$}}
-; CHECK: Symbol: _OtherStdcallExportName@4{{$}}
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__CdeclExportName
-; CHECK: Symbol: _CdeclExportName
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp__StdcallExportName@4{{$}}
+; CHECK-NEXT: Symbol: _StdcallExportName@4{{$}}
+; CHECK:      Name type: undecorate
+; CHECK-NEXT: Symbol: __imp__OtherStdcallExportName@4{{$}}
+; CHECK-NEXT: Symbol: _OtherStdcallExportName@4{{$}}
+; CHECK:      Name type: noprefix
+; CHECK-NEXT: Symbol: __imp__CdeclExportName
+; CHECK-NEXT: Symbol: _CdeclExportName

diff --git a/llvm/test/tools/llvm-dlltool/coff-exports.def b/llvm/test/tools/llvm-dlltool/coff-exports.def
index 78ca880..743c655 100644 (file)
--- a/llvm/test/tools/llvm-dlltool/coff-exports.def
+++ b/llvm/test/tools/llvm-dlltool/coff-exports.def
@@ -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{{$}}

diff --git a/llvm/test/tools/llvm-dlltool/coff-noname.def b/llvm/test/tools/llvm-dlltool/coff-noname.def
index 4bad21f..6631109 100644 (file)
--- a/llvm/test/tools/llvm-dlltool/coff-noname.def
+++ b/llvm/test/tools/llvm-dlltool/coff-noname.def
@@ -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