From ad100be4e44c2b5f6dbe99d50a51682ef3b7c12a Mon Sep 17 00:00:00 2001
From: Don Hinton <hintonda@gmail.com>
Date: Thu, 4 Apr 2019 17:35:41 +0000
Subject: [PATCH] [llvm-objcopy] [llvm-symbolizer] Fix failing tests

Summary: Fix failing tests that matched substrings in path.

Reviewers: evgeny777, mattd, espindola, alexshap, rupprecht, jhenderson

Reviewed By: jhenderson

Subscribers: Bulletmagnet, emaste, arichardson, jakehehrlich, MaskRay, rupprecht, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D60170

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@357709 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-objcopy/ELF/regex.test        | 24 ++++++++++++-------
 .../ignore-undefined-symbols.s                |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/tools/llvm-objcopy/ELF/regex.test b/test/tools/llvm-objcopy/ELF/regex.test
index 9baccb06483..9fe751fc862 100644
--- a/test/tools/llvm-objcopy/ELF/regex.test
+++ b/test/tools/llvm-objcopy/ELF/regex.test
@@ -46,14 +46,20 @@ Symbols:
     Value:    0x1010
     Size:     8
 
-#REGEX1-NOT: foobaz
-#REGEX1-NOT: bar
-#REGEX1-NOT: rebar
+#REGEX1:     Symbols [
+#REGEX1-NOT:   Name: foobaz
+#REGEX1-NOT:   Name: bar
+#REGEX1-NOT:   Name: rebar
+#REGEX1:     ]
 
-#REGEX2-NOT: foobaz
-#REGEX2: bar
-#REGEX2-NOT: rebar
+#REGEX2:     Symbols [
+#REGEX2-NOT:   Name: foobaz
+#REGEX2:       Name: bar
+#REGEX2-NOT:   Name: rebar
+#REGEX2:     ]
 
-#REGEX3: foobaz
-#REGEX3: bar
-#REGEX3: rebar
+#REGEX3: Symbols [
+#REGEX3:   Name: foobaz
+#REGEX3:   Name: bar
+#REGEX3:   Name: rebar
+#REGEX3: ]
diff --git a/test/tools/llvm-symbolizer/ignore-undefined-symbols.s b/test/tools/llvm-symbolizer/ignore-undefined-symbols.s
index 62b7df32dc5..243a8171173 100644
--- a/test/tools/llvm-symbolizer/ignore-undefined-symbols.s
+++ b/test/tools/llvm-symbolizer/ignore-undefined-symbols.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86-registered-target
 # RUN: llvm-mc --filetype=obj --triple=x86_64-pc-linux %s -o %t.o -g
-# RUN: llvm-symbolizer --obj=%t.o 0 | FileCheck %s --implicit-check-not=bar
+# RUN: llvm-symbolizer --obj=%t.o 0 | FileCheck %s --implicit-check-not={{^}}bar{{$}}
 
 # CHECK:      foo
 # CHECK-NEXT: ignore-undefined-symbols.s:12:0
-- 
2.50.1