[lld] r320793 - Repair Windows buildbots after r320792

Shoaib Meenai via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 15 00:08:26 PST 2017


Author: smeenai
Date: Fri Dec 15 00:08:26 2017
New Revision: 320793

URL: http://llvm.org/viewvc/llvm-project?rev=320793&view=rev
Log:
Repair Windows buildbots after r320792

Windows paths have colons in them, so the regex will fail there. Just
match for any character; the rest of the message will restrict the match
to the path anyway.

Modified:
    lld/trunk/test/COFF/locally-imported-warn-multiple.s
    lld/trunk/test/COFF/locally-imported.test

Modified: lld/trunk/test/COFF/locally-imported-warn-multiple.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/locally-imported-warn-multiple.s?rev=320793&r1=320792&r2=320793&view=diff
==============================================================================
--- lld/trunk/test/COFF/locally-imported-warn-multiple.s (original)
+++ lld/trunk/test/COFF/locally-imported-warn-multiple.s Fri Dec 15 00:08:26 2017
@@ -6,8 +6,8 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc -o %t.obj %s
 # RUN: lld-link /entry:main %T/locally-imported-def.obj %T/locally-imported-imp1.obj %T/locally-imported-imp2.obj %t.obj 2>&1 | FileCheck %s
 
-# CHECK: warning: [[TESTDIR:[^:]+]]locally-imported-imp1.obj: locally defined symbol imported: f (defined in [[TESTDIR]]locally-imported-def.obj)
-# CHECK-NEXT: warning: [[TESTDIR:[^:]+]]locally-imported-imp2.obj: locally defined symbol imported: f (defined in [[TESTDIR]]locally-imported-def.obj)
+# CHECK: warning: [[TESTDIR:.+]]locally-imported-imp1.obj: locally defined symbol imported: f (defined in [[TESTDIR]]locally-imported-def.obj)
+# CHECK-NEXT: warning: [[TESTDIR:.+]]locally-imported-imp2.obj: locally defined symbol imported: f (defined in [[TESTDIR]]locally-imported-def.obj)
 
 .globl main
 main:

Modified: lld/trunk/test/COFF/locally-imported.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/locally-imported.test?rev=320793&r1=320792&r2=320793&view=diff
==============================================================================
--- lld/trunk/test/COFF/locally-imported.test (original)
+++ lld/trunk/test/COFF/locally-imported.test Fri Dec 15 00:08:26 2017
@@ -3,7 +3,7 @@
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
 # RUN: llvm-readobj -coff-basereloc %t.exe | FileCheck -check-prefix=BASEREL %s
 
-# WARN: warning: [[INPUT:[^:]+]]: locally defined symbol imported: main (defined in [[INPUT]])
+# WARN: warning: [[INPUT:.+]]: locally defined symbol imported: main (defined in [[INPUT]])
 
 # CHECK:      Contents of section .text:
 # CHECK-NEXT: 1000 00200000




More information about the llvm-commits mailing list