[lld] r336424 - Relax filechecks in r336405 tests

[Hans Wennborg via llvm-commits]

Author: hans
Date: Fri Jul  6 01:44:08 2018
New Revision: 336424

URL: http://llvm.org/viewvc/llvm-project?rev=336424&view=rev
Log:
Relax filechecks in r336405 tests

They were failing in Chromium's packaging builds with:

  C:\b\rr\tmphqfaff\w\src\third_party\llvm\tools\lld\test\COFF\pdb-globals-dia-vfunc-collision2.test:24:8:
  error: expected string not found in input
  CHECK: func [0x00001060+ 0 - 0x0000106c-12 | sizeof= 12] (FPO) virtual int __cdecl A132()
         ^
  <stdin>:8:11: note: scanning from here
   struct S [sizeof = 8] {
            ^
  <stdin>:9:2: note: possible intended match here
   func [0x00001060+ 0 - 0x0000106c-12 | sizeof= 12] (FPO) virtual int __cdecl S::A132()
   ^

Maybe due to different DIA versions.

Modified:
    lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision.test
    lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision2.test
    lld/trunk/test/COFF/pdb-globals-dia-vfunc-simple.test

Modified: lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision.test?rev=336424&r1=336423&r2=336424&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision.test (original)
+++ lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision.test Fri Jul  6 01:44:08 2018
@@ -30,13 +30,13 @@ RUN: lld-link /debug /nodefaultlib /entr
 RUN: llvm-pdbutil pretty -classes %t.pdb | FileCheck %s
 
 CHECK: struct T
-CHECK: func [0x000010c0+ 0 - 0x000010dd-29 | sizeof= 29] (FPO) virtual int __cdecl A105()
-CHECK: func [0x00001100+ 0 - 0x0000111b-27 | sizeof= 27] (FPO) virtual int __cdecl A307()
-CHECK: func [0x000010e0+ 0 - 0x000010fd-29 | sizeof= 29] (FPO) virtual int __cdecl A206()
-CHECK: func [0x00001120+ 0 - 0x0000113b-27 | sizeof= 27] (FPO) virtual int __cdecl A400()
+CHECK: func [0x000010c0+ 0 - 0x000010dd-29 | sizeof= 29] (FPO) virtual {{.*}}A105()
+CHECK: func [0x00001100+ 0 - 0x0000111b-27 | sizeof= 27] (FPO) virtual {{.*}}A307()
+CHECK: func [0x000010e0+ 0 - 0x000010fd-29 | sizeof= 29] (FPO) virtual {{.*}}A206()
+CHECK: func [0x00001120+ 0 - 0x0000113b-27 | sizeof= 27] (FPO) virtual {{.*}}A400()
 
 CHECK: struct S
-CHECK: func [0x00001160+ 0 - 0x0000116c-12 | sizeof= 12] (FPO) virtual int __cdecl A307()
-CHECK: func [0x00001170+ 0 - 0x0000117c-12 | sizeof= 12] (FPO) virtual int __cdecl A400()
-CHECK: func [0x00001180+ 0 - 0x0000118c-12 | sizeof= 12] (FPO) virtual int __cdecl A206()
-CHECK: func [0x00001190+ 0 - 0x0000119c-12 | sizeof= 12] (FPO) virtual int __cdecl A105()
+CHECK: func [0x00001160+ 0 - 0x0000116c-12 | sizeof= 12] (FPO) virtual {{.*}}A307()
+CHECK: func [0x00001170+ 0 - 0x0000117c-12 | sizeof= 12] (FPO) virtual {{.*}}A400()
+CHECK: func [0x00001180+ 0 - 0x0000118c-12 | sizeof= 12] (FPO) virtual {{.*}}A206()
+CHECK: func [0x00001190+ 0 - 0x0000119c-12 | sizeof= 12] (FPO) virtual {{.*}}A105()

Modified: lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision2.test?rev=336424&r1=336423&r2=336424&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision2.test (original)
+++ lld/trunk/test/COFF/pdb-globals-dia-vfunc-collision2.test Fri Jul  6 01:44:08 2018
@@ -21,5 +21,5 @@ RUN: lld-link /debug /nodefaultlib /entr
 RUN: llvm-pdbutil pretty -classes %t.pdb | FileCheck %s
 
 CHECK: struct S
-CHECK: func [0x00001060+ 0 - 0x0000106c-12 | sizeof= 12] (FPO) virtual int __cdecl A132()
-CHECK: func [0x00001070+ 0 - 0x0000107c-12 | sizeof= 12] (FPO) virtual int __cdecl A1001()
+CHECK: func [0x00001060+ 0 - 0x0000106c-12 | sizeof= 12] (FPO) virtual {{.*}}A132()
+CHECK: func [0x00001070+ 0 - 0x0000107c-12 | sizeof= 12] (FPO) virtual {{.*}}A1001()

Modified: lld/trunk/test/COFF/pdb-globals-dia-vfunc-simple.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-globals-dia-vfunc-simple.test?rev=336424&r1=336423&r2=336424&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-globals-dia-vfunc-simple.test (original)
+++ lld/trunk/test/COFF/pdb-globals-dia-vfunc-simple.test Fri Jul  6 01:44:08 2018
@@ -22,5 +22,5 @@ clang-cl /Z7 /GS- /GR- /c main.cpp /Fogl
 RUN: lld-link /debug /nodefaultlib /entry:main /out:%t.exe %S/Inputs/globals-dia-vfunc-simple.obj
 RUN: llvm-pdbutil pretty -classes %t.pdb | FileCheck %s
 
-CHECK: func [0x00001070+ 0 - 0x0000107c-12 | sizeof= 12] (FPO) virtual int __cdecl V2()
-CHECK: func [0x000010a0+ 0 - 0x000010ac-12 | sizeof= 12] (FPO) virtual int __cdecl V2()
+CHECK: func [0x00001070+ 0 - 0x0000107c-12 | sizeof= 12] (FPO) virtual {{.*}}V2()
+CHECK: func [0x000010a0+ 0 - 0x000010ac-12 | sizeof= 12] (FPO) virtual {{.*}}V2()