unique.exp: Update contains_unique_symbol

Message ID CAMe9rOrYxBFtBhN3Juf0pFzah53J=cYrQcVhmfv9wvLNtkQ+9g@mail.gmail.com
State New
Headers show
Series
  • unique.exp: Update contains_unique_symbol
Related show

Commit Message

H.J. Lu Feb. 7, 2020, 8:07 p.m.
Since commit 9fc0b501af78b changed symbols from a/b to a_val/b_val,
contains_unique_symbol needs adjustment.

* testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated.


-- 
H.J.

Comments

Sergey Belyashov Feb. 8, 2020, 4:49 a.m. | #1
Hi,
I have no commit rights, so do not loose time on me. Just fill bug on
bugzilla.


пт, 7 февр. 2020 г., 23:07 H.J. Lu <hjl.tools@gmail.com>:

> Since commit 9fc0b501af78b changed symbols from a/b to a_val/b_val,

> contains_unique_symbol needs adjustment.

>

> * testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated.

>

>

> --

> H.J.

>

Patch

From 6e5696561610bcde8f0fe63c967b8a96d70dbf2b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 7 Feb 2020 12:01:58 -0800
Subject: [PATCH] unique.exp: Update contains_unique_symbol

Since commit 9fc0b501af78b changed symbols from a/b to a_val/b_val,
contains_unique_symbol needs adjustment.

	* testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated.
---
 ld/ChangeLog                      | 4 ++++
 ld/testsuite/ld-unique/unique.exp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 44a6887980..c3b5541b96 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@ 
+2020-02-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated.
+
 2020-02-07  Sergey Belyashov  <sergey.belyashov@gmail.com>
 
 	PR 25469
diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp
index 1f80b39c05..0775c7d64a 100644
--- a/ld/testsuite/ld-unique/unique.exp
+++ b/ld/testsuite/ld-unique/unique.exp
@@ -92,7 +92,7 @@  proc contains_unique_symbol { binary_file } {
     # Look for a line like this:
     #    54: 0000000000400474     4 OBJECT  UNIQUE DEFAULT   13 a
 
-    if { ![regexp ".*\[ \]*OBJECT\[ \]+UNIQUE\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+\[ab\]\n" [file_contents readelf.out]] } {
+    if { ![regexp ".*\[ \]*OBJECT\[ \]+UNIQUE\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+\[ab\]_val\n" [file_contents readelf.out]] } {
 	return 0
     }
 
-- 
2.24.1