| Message ID | 20240514134746.24737-1-tdevries@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | [testsuite] Fix gcc.dg/pr115066.c fail on aarch64 | expand |
On Tue, May 14, 2024 at 03:47:46PM +0200, Tom de Vries wrote: > On aarch64, I get this failure: > ... > FAIL: gcc.dg/pr115066.c scan-assembler \\.byte\\t0xb\\t# Define macro strx > ... > > This happens because we expect to match: > ... > .byte 0xb # Define macro strx > ... > but instead we get: > ... > .byte 0xb // Define macro strx > ... > > Fix this by not explicitly matching the comment marker. > > Tested on aarch64 and x86_64. > > gcc/testsuite/ChangeLog: > > 2024-05-14 Tom de Vries <tdevries@suse.de> > > * gcc.dg/pr115066.c: Don't match comment marker. > --- > gcc/testsuite/gcc.dg/pr115066.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Ok. Jakub
On Tue, May 14, 2024 at 03:47:46PM +0200, Tom de Vries wrote: > On aarch64, I get this failure: > ... > FAIL: gcc.dg/pr115066.c scan-assembler \\.byte\\t0xb\\t# Define macro strx > ... > > This happens because we expect to match: > ... > .byte 0xb # Define macro strx > ... > but instead we get: > ... > .byte 0xb // Define macro strx > ... > > Fix this by not explicitly matching the comment marker. > > Tested on aarch64 and x86_64. > > gcc/testsuite/ChangeLog: > > 2024-05-14 Tom de Vries <tdevries@suse.de> > > * gcc.dg/pr115066.c: Don't match comment marker. > --- > gcc/testsuite/gcc.dg/pr115066.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gcc/testsuite/gcc.dg/pr115066.c b/gcc/testsuite/gcc.dg/pr115066.c > index 645757df209..a7e98500160 100644 > --- a/gcc/testsuite/gcc.dg/pr115066.c > +++ b/gcc/testsuite/gcc.dg/pr115066.c > @@ -2,7 +2,7 @@ > /* { dg-skip-if "split DWARF unsupported" { hppa*-*-hpux* powerpc*-ibm-aix* *-*-darwin* } } */ > /* { dg-options "-gsplit-dwarf -g3 -dA -gdwarf-4" } */ > /* { dg-final { scan-assembler-times {\.section\t"?\.debug_macro} 1 } } */ > -/* { dg-final { scan-assembler-not {\.byte\t0x5\t# Define macro strp} } } */ > -/* { dg-final { scan-assembler {\.byte\t0xb\t# Define macro strx} } } */ > +/* { dg-final { scan-assembler-not {\.byte\t0x5\t.* Define macro strp} } } */ > +/* { dg-final { scan-assembler {\.byte\t0xb\t.* Define macro strx} } } */ Actually, perhaps better use [^\n\r]* instead of .* You don't want to match the comment on a different line. Jakub
diff --git a/gcc/testsuite/gcc.dg/pr115066.c b/gcc/testsuite/gcc.dg/pr115066.c index 645757df209..a7e98500160 100644 --- a/gcc/testsuite/gcc.dg/pr115066.c +++ b/gcc/testsuite/gcc.dg/pr115066.c @@ -2,7 +2,7 @@ /* { dg-skip-if "split DWARF unsupported" { hppa*-*-hpux* powerpc*-ibm-aix* *-*-darwin* } } */ /* { dg-options "-gsplit-dwarf -g3 -dA -gdwarf-4" } */ /* { dg-final { scan-assembler-times {\.section\t"?\.debug_macro} 1 } } */ -/* { dg-final { scan-assembler-not {\.byte\t0x5\t# Define macro strp} } } */ -/* { dg-final { scan-assembler {\.byte\t0xb\t# Define macro strx} } } */ +/* { dg-final { scan-assembler-not {\.byte\t0x5\t.* Define macro strp} } } */ +/* { dg-final { scan-assembler {\.byte\t0xb\t.* Define macro strx} } } */ #define foo 1
On aarch64, I get this failure: ... FAIL: gcc.dg/pr115066.c scan-assembler \\.byte\\t0xb\\t# Define macro strx ... This happens because we expect to match: ... .byte 0xb # Define macro strx ... but instead we get: ... .byte 0xb // Define macro strx ... Fix this by not explicitly matching the comment marker. Tested on aarch64 and x86_64. gcc/testsuite/ChangeLog: 2024-05-14 Tom de Vries <tdevries@suse.de> * gcc.dg/pr115066.c: Don't match comment marker. --- gcc/testsuite/gcc.dg/pr115066.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: b7003b4cc5e263343f047fe64ed1ae12f561b2d1