Re: Add --enable-linker-version option

Message ID 20230316132101.205752-1-christophe.lyon@linaro.org
State Accepted
Headers
Series Re: Add --enable-linker-version option |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Frager, Neal via Binutils March 16, 2023, 1:21 p.m. UTC
  From: Christophe Lyon <christophe.lyon@linaro.org>

The recently-added ld-version*.d tests expect
.*GNU ld \(GNU Binutils\) 2.*
in the .comment section.

However, when buidling --with-pkgversion=XXX, we get
GNU ld (XXX) 2.[...]
instead, leading to a spurious FAIL.

This small patch replaces "GNU Binutils" with ".*" instead.

I inspected other testcases to see if we already had similar
occurrences but I couldn't see any, so I hope this fix is OK for the
purpose?

Thanks,

Christophe
---
 ld/testsuite/ld-scripts/ld-version-2.d | 2 +-
 ld/testsuite/ld-scripts/ld-version.d   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Nick Clifton March 16, 2023, 1:56 p.m. UTC | #1
Hi Christophe,

> The recently-added ld-version*.d tests expect
> .*GNU ld \(GNU Binutils\) 2.*
> in the .comment section.
> 
> However, when buidling --with-pkgversion=XXX, we get
> GNU ld (XXX) 2.[...]
> instead, leading to a spurious FAIL.
> 
> This small patch replaces "GNU Binutils" with ".*" instead.
> 
> I inspected other testcases to see if we already had similar
> occurrences but I couldn't see any, so I hope this fix is OK for the
> purpose?

It is.  Patch approved - please apply.

Cheers
   Nick
  

Patch

diff --git a/ld/testsuite/ld-scripts/ld-version-2.d b/ld/testsuite/ld-scripts/ld-version-2.d
index c8738fd82d6..c696c093d69 100644
--- a/ld/testsuite/ld-scripts/ld-version-2.d
+++ b/ld/testsuite/ld-scripts/ld-version-2.d
@@ -4,4 +4,4 @@ 
 # target: [is_elf_format]
 
 String dump of section '.comment':
-.*GNU ld \(GNU Binutils\) 2.*
+.*GNU ld \(.*\) 2.*
diff --git a/ld/testsuite/ld-scripts/ld-version.d b/ld/testsuite/ld-scripts/ld-version.d
index a55fc5e003b..7d1ffc5a45e 100644
--- a/ld/testsuite/ld-scripts/ld-version.d
+++ b/ld/testsuite/ld-scripts/ld-version.d
@@ -4,4 +4,4 @@ 
 # target: [is_elf_format]
 
 String dump of section '.comment':
-.*GNU ld \(GNU Binutils\) 2.*
+.*GNU ld \(.*\) 2.*