Author: David Blaikie Date: 2020-02-13T11:37:18+01:00 New Revision: 90c78073f73eac58f4f8b4772a896dc8aac023bc
URL: https://github.com/llvm/llvm-project/commit/90c78073f73eac58f4f8b4772a896dc8aac023bc DIFF: https://github.com/llvm/llvm-project/commit/90c78073f73eac58f4f8b4772a896dc8aac023bc.diff LOG: Linker/module-max-warn.ll: Fix test to be compatible with Windows file separators (cherry picked from commit 84eeee65804ba070c50978be1c741a1756779079) Added: Modified: llvm/test/Linker/module-max-warn.ll Removed: ################################################################################ diff --git a/llvm/test/Linker/module-max-warn.ll b/llvm/test/Linker/module-max-warn.ll index b05688446ed5..a92cd22f1c9f 100644 --- a/llvm/test/Linker/module-max-warn.ll +++ b/llvm/test/Linker/module-max-warn.ll @@ -1,7 +1,7 @@ ; RUN: llvm-link %s %p/Inputs/module-max-warn.ll -S -o - 2>&1 | FileCheck %s -; CHECK: warning: linking module flags 'Combine Max and Warn': IDs have conflicting values ('i32 4' from {{.*}}/test/Linker/Inputs/module-max-warn.ll with 'i32 2' from llvm-link) -; CHECK: warning: linking module flags 'Combine Warn and Max': IDs have conflicting values ('i32 5' from {{.*}}/test/Linker/Inputs/module-max-warn.ll with 'i32 3' from llvm-link) +; CHECK: warning: linking module flags 'Combine Max and Warn': IDs have conflicting values ('i32 4' from {{.*}}/Inputs/module-max-warn.ll with 'i32 2' from llvm-link) +; CHECK: warning: linking module flags 'Combine Warn and Max': IDs have conflicting values ('i32 5' from {{.*}}/Inputs/module-max-warn.ll with 'i32 3' from llvm-link) ; CHECK: !0 = !{i32 7, !"Combine Max and Warn", i32 4} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits