From 002a5d4e5881ea0fbcd7f9382b20b833ad6bf9d5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 17 Feb 2017 17:24:02 +1030 Subject: [PATCH] Relax dwarf3 expected error match * testsuite/ld-elf/dwarf2.err: Add missing newline at end. * testsuite/ld-elf/dwarf3.err: Likewise. Allow match without filename. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-elf/dwarf2.err | 2 +- ld/testsuite/ld-elf/dwarf3.err | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 7d4739756a3..1c17c17adea 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-02-17 Alan Modra + + * testsuite/ld-elf/dwarf2.err: Add missing newline at end. + * testsuite/ld-elf/dwarf3.err: Likewise. Allow match without filename. + 2017-02-16 Andrew Burgess * testsuite/ld-elf/shared.exp: Update expected results. diff --git a/ld/testsuite/ld-elf/dwarf2.err b/ld/testsuite/ld-elf/dwarf2.err index b4ea67fc195..6b97ee61c3f 100644 --- a/ld/testsuite/ld-elf/dwarf2.err +++ b/ld/testsuite/ld-elf/dwarf2.err @@ -2,4 +2,4 @@ tmpdir/dwarf2b\.o:.*dwarf2b\.c:1: multiple definition of `global_var' tmpdir/dwarf2a\.o:.*dwarf2a\.c:1: first defined here tmpdir/dwarf2b\.o:.*dwarf2b\.c:2: multiple definition of `other_var' tmpdir/dwarf2a\.o:.*dwarf2a\.c:2: first defined here -#... \ No newline at end of file +#... diff --git a/ld/testsuite/ld-elf/dwarf3.err b/ld/testsuite/ld-elf/dwarf3.err index 602743138c6..6f5a8cc3572 100644 --- a/ld/testsuite/ld-elf/dwarf3.err +++ b/ld/testsuite/ld-elf/dwarf3.err @@ -1,4 +1,4 @@ .*/dwarf3\.o: In function `main': -.*dwarf3.c:\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' -.*dwarf3.c:\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' -#... \ No newline at end of file +.*\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' +.*\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' +#... -- 2.30.2