From 5c7060d3179ce4d0dc3dc6881fff36fd904c7088 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sun, 31 Mar 2002 16:29:04 +0000 Subject: [PATCH] instantiate1.C, [...]: Tweak match patterns. * g++.dg/ext/instantiate1.C, g++.dg/ext/instantiate2.C, g++.dg/ext/instantiate3.C: Tweak match patterns. From-SVN: r51657 --- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/ext/instantiate1.C | 8 ++++---- gcc/testsuite/g++.dg/ext/instantiate2.C | 4 ++-- gcc/testsuite/g++.dg/ext/instantiate3.C | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8015ae97930..0f0c14a5fca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2002-03-31 Hans-Peter Nilsson + * g++.dg/ext/instantiate1.C, g++.dg/ext/instantiate2.C, + g++.dg/ext/instantiate3.C: Tweak match patterns. + * g++.old-deja/g++.pt/static11.C: Skip on mmix-knuth-mmixware. * g++.dg/other/static11.C: Copy g++.old-deja/g++.pt/static11.C for -da test. diff --git a/gcc/testsuite/g++.dg/ext/instantiate1.C b/gcc/testsuite/g++.dg/ext/instantiate1.C index 04d740029cc..1d2a6200b0a 100644 --- a/gcc/testsuite/g++.dg/ext/instantiate1.C +++ b/gcc/testsuite/g++.dg/ext/instantiate1.C @@ -11,14 +11,14 @@ template struct A { template void A::f () { } extern template struct A; -// { dg-final { scan-assembler-not "\n_?_Z1fIiEvT_(:|\n)" } } +// { dg-final { scan-assembler-not "\n_?_Z1fIiEvT_(:|\n|\t)" } } void test_f_int () { f(42); } -// { dg-final { scan-assembler-not "\n_?_ZN1AIiE1fEv(:|\n)" } } +// { dg-final { scan-assembler-not "\n_?_ZN1AIiE1fEv(:|\n|\t)" } } void test_A_int_f () { A a; a.f (); } -// { dg-final { scan-assembler "\n_?_Z1fIdEvT_(:|\n)" } } +// { dg-final { scan-assembler "\n_?_Z1fIdEvT_(:|\n|\t)" } } void test_f_double () { f (2.0); } -// { dg-final { scan-assembler "\n_?_ZN1AIdE1fEv(:|\n)" } } +// { dg-final { scan-assembler "\n_?_ZN1AIdE1fEv(:|\n|\t)" } } void test_A_double_f () { A b; b.f (); } diff --git a/gcc/testsuite/g++.dg/ext/instantiate2.C b/gcc/testsuite/g++.dg/ext/instantiate2.C index c812dba85db..97ef45c874d 100644 --- a/gcc/testsuite/g++.dg/ext/instantiate2.C +++ b/gcc/testsuite/g++.dg/ext/instantiate2.C @@ -8,8 +8,8 @@ template struct A { template T A::t = 0; static template struct A; -// { dg-final { scan-assembler "\n_?_ZN1AIiE1tE(:|\n)" } } +// { dg-final { scan-assembler "\n_?_ZN1AIiE1tE(:|\n|\t)" } } void test_int() { A::t = 42; } -// { dg-final { scan-assembler-not "\n_?_ZN1AIcE1tE(:|\n)" } } +// { dg-final { scan-assembler-not "\n_?_ZN1AIcE1tE(:|\n|\t)" } } void test_char() { A::t = 42; } diff --git a/gcc/testsuite/g++.dg/ext/instantiate3.C b/gcc/testsuite/g++.dg/ext/instantiate3.C index c0f61fcef97..ea60d5bf98c 100644 --- a/gcc/testsuite/g++.dg/ext/instantiate3.C +++ b/gcc/testsuite/g++.dg/ext/instantiate3.C @@ -7,8 +7,8 @@ template struct A { }; inline template struct A; -// { dg-final { scan-assembler "\n_?_ZTV1AIiE(:|\n)" } } +// { dg-final { scan-assembler "\n_?_ZTV1AIiE(:|\n|\t)" } } A a; -// { dg-final { scan-assembler-not "\n_?_ZTV1AIcE(:|\n)" } } +// { dg-final { scan-assembler-not "\n_?_ZTV1AIcE(:|\n|\t)" } } A b;