From 3c1d41015b700c1eca3bb23f52440fa1b1328d9f Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 12 Feb 2021 11:41:16 +1030 Subject: [PATCH] gas testsuite: adjust recently added tests for hppa Some hppa gas targets treat anything starting in the first column as a label, so directives can't start there. Also, binutils_assemble and run_dump_test cleverly edit test source to suit the hppa .comm directive which has a different syntax to most targets. The editing means we can't match source file names in dumps. Finally, hppa gas complains if instructions are emitted without a ".text" or similar directive. * testsuite/gas/all/pr27381.err: Don't match source file name. * testsuite/gas/all/pr27381.s: Don't start directive in first column. * testsuite/gas/all/pr27384.err: Don't match source file name. Adjust line number. * testsuite/gas/all/pr27384.s: Add ".text" directive. * testsuite/gas/elf/pr27355.err: Don't match source file name. --- gas/ChangeLog | 9 +++++++++ gas/testsuite/gas/all/pr27381.err | 4 ++-- gas/testsuite/gas/all/pr27381.s | 2 +- gas/testsuite/gas/all/pr27384.err | 6 +++--- gas/testsuite/gas/all/pr27384.s | 2 +- gas/testsuite/gas/elf/pr27355.err | 10 +++++----- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index e640fecd054..6e701292fa9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2021-02-12 Alan Modra + + * testsuite/gas/all/pr27381.err: Don't match source file name. + * testsuite/gas/all/pr27381.s: Don't start directive in first column. + * testsuite/gas/all/pr27384.err: Don't match source file name. + Adjust line number. + * testsuite/gas/all/pr27384.s: Add ".text" directive. + * testsuite/gas/elf/pr27355.err: Don't match source file name. + 2021-02-11 Alan Modra * NEWS: Mention arm-symbianelf removal. diff --git a/gas/testsuite/gas/all/pr27381.err b/gas/testsuite/gas/all/pr27381.err index f414210c798..493180d59ca 100644 --- a/gas/testsuite/gas/all/pr27381.err +++ b/gas/testsuite/gas/all/pr27381.err @@ -1,2 +1,2 @@ -.*pr27381.s: Assembler messages: -.*pr27381.s:1: Error: unable to include `/etc/' +.*: Assembler messages: +.*:1: Error: unable to include `/etc/' diff --git a/gas/testsuite/gas/all/pr27381.s b/gas/testsuite/gas/all/pr27381.s index b75523fc6d0..949b624d86a 100644 --- a/gas/testsuite/gas/all/pr27381.s +++ b/gas/testsuite/gas/all/pr27381.s @@ -1 +1 @@ -.incbin "/etc/" + .incbin "/etc/" diff --git a/gas/testsuite/gas/all/pr27384.err b/gas/testsuite/gas/all/pr27384.err index 2d5954f91ed..3eb1e5362ad 100644 --- a/gas/testsuite/gas/all/pr27384.err +++ b/gas/testsuite/gas/all/pr27384.err @@ -1,4 +1,4 @@ -.*pr27384.s: Assembler messages: -.*pr27384.s:2: Error: bad or irreducible absolute expression -.*pr27384.s:2: Error: new paper width is too small +.*: Assembler messages: +.*:3: Error: bad or irreducible absolute expression +.*:3: Error: new paper width is too small #pass diff --git a/gas/testsuite/gas/all/pr27384.s b/gas/testsuite/gas/all/pr27384.s index 6d831b0d5f9..51274bdabe7 100644 --- a/gas/testsuite/gas/all/pr27384.s +++ b/gas/testsuite/gas/all/pr27384.s @@ -1,4 +1,4 @@ + .text .nop .Psize f,-7 .nop - diff --git a/gas/testsuite/gas/elf/pr27355.err b/gas/testsuite/gas/elf/pr27355.err index 6f5e2eae17f..fdbeb224f03 100644 --- a/gas/testsuite/gas/elf/pr27355.err +++ b/gas/testsuite/gas/elf/pr27355.err @@ -1,5 +1,5 @@ -.*pr27355.s: Assembler messages: -.*pr27355.s:1: Error: bad expression -.*pr27355.s:2: Error: bad or irreducible absolute expression -.*pr27355.s:3: Error: bad or irreducible absolute expression -.*pr27355.s:3: Error: missing string +.*: Assembler messages: +.*:1: Error: bad expression +.*:2: Error: bad or irreducible absolute expression +.*:3: Error: bad or irreducible absolute expression +.*:3: Error: missing string -- 2.30.2