From afeaeb708e284a72057de65c32e6758ce3c136d4 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sun, 16 Apr 2017 08:17:14 +0000 Subject: [PATCH] Remove braces around line number in dejagnu directive 2017-04-16 Tom de Vries * g++.dg/parse/error11.C: Remove braces around line number in dejagnu directive. * g++.dg/parse/error3.C: Same. * g++.old-deja/g++.pt/niklas01a.C: Same. * gcc.dg/990506-0.c: Same. * gcc.dg/cpp/19990413-1.c: Same. * gcc.dg/cpp/pragma-1.c: Same. * gcc.dg/cpp/pragma-2.c: Same. * gcc.dg/m-un-2.c: Same. * objc.dg/private-1.m: Same. From-SVN: r246945 --- gcc/testsuite/ChangeLog | 13 +++++++++++++ gcc/testsuite/g++.dg/parse/error11.C | 2 +- gcc/testsuite/g++.dg/parse/error3.C | 2 +- gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C | 2 +- gcc/testsuite/gcc.dg/990506-0.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/19990413-1.c | 2 +- gcc/testsuite/gcc.dg/cpp/pragma-1.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/pragma-2.c | 4 ++-- gcc/testsuite/gcc.dg/m-un-2.c | 4 ++-- gcc/testsuite/objc.dg/private-1.m | 2 +- 10 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 619e17e75e6..8286f736d6f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2017-04-16 Tom de Vries + + * g++.dg/parse/error11.C: Remove braces around line number in dejagnu + directive. + * g++.dg/parse/error3.C: Same. + * g++.old-deja/g++.pt/niklas01a.C: Same. + * gcc.dg/990506-0.c: Same. + * gcc.dg/cpp/19990413-1.c: Same. + * gcc.dg/cpp/pragma-1.c: Same. + * gcc.dg/cpp/pragma-2.c: Same. + * gcc.dg/m-un-2.c: Same. + * objc.dg/private-1.m: Same. + 2017-04-15 Uros Bizjak * gcc.dg/pr54669.c: Fix dg-do directive. diff --git a/gcc/testsuite/g++.dg/parse/error11.C b/gcc/testsuite/g++.dg/parse/error11.C index 846e676c9c0..a67160b25e0 100644 --- a/gcc/testsuite/g++.dg/parse/error11.C +++ b/gcc/testsuite/g++.dg/parse/error11.C @@ -50,7 +50,7 @@ void func(void) // the special error message. Foo<: :B> k2; // { dg-bogus "cannot begin|alternate spelling" "smart error should not be triggered here" } Foo[:B> k1; // { dg-bogus "cannot begin|alternate spelling" "smart error should not be triggered here" } -// { dg-error "6:missing template arguments before" "template" { target *-*-* } { 51 } } +// { dg-error "6:missing template arguments before" "template" { target *-*-* } 51 } // { dg-error "9:expected primary-expression before ':' token" "primary" { target *-*-* } 51 } // { dg-error "9:expected '\]' before ':' token" "backslash" { target *-*-* } 51 } // { dg-error "6:missing template arguments before" "template" { target *-*-* } 52 } diff --git a/gcc/testsuite/g++.dg/parse/error3.C b/gcc/testsuite/g++.dg/parse/error3.C index 938ab45b24c..cf01dbe6da4 100644 --- a/gcc/testsuite/g++.dg/parse/error3.C +++ b/gcc/testsuite/g++.dg/parse/error3.C @@ -5,4 +5,4 @@ static void InstantiateConstraint(const float&, unsigned, void(*AddFunction)(const TYPE&,bool&, char*, char*, unsigned*)); -// { dg-error "60: 'TYPE' does not name a type" "does not" { target *-*-* } { 5 } } +// { dg-error "60: 'TYPE' does not name a type" "does not" { target *-*-* } 5 } diff --git a/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C b/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C index 3130d32cadb..f2b27a661de 100644 --- a/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C @@ -4,6 +4,6 @@ struct A { // { dg-message "" } forward declaration friend struct B : A { // { dg-error "invalid use of incomplete type 'struct A" "invalid" } int x; - }; // { dg-error "class definition may not be declared a friend" "may not" { target *-*-* } { 5 } } + }; // { dg-error "class definition may not be declared a friend" "may not" { target *-*-* } 5 } int y; }; diff --git a/gcc/testsuite/gcc.dg/990506-0.c b/gcc/testsuite/gcc.dg/990506-0.c index 3cd3be3fe52..3f5f02dbabf 100644 --- a/gcc/testsuite/gcc.dg/990506-0.c +++ b/gcc/testsuite/gcc.dg/990506-0.c @@ -4,6 +4,6 @@ x() { foo (i); - /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } { 6 } } */ - /* { dg-message "function it appears in" "reminder message" { target *-*-* } { 6 } } */ + /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } 6 } */ + /* { dg-message "function it appears in" "reminder message" { target *-*-* } 6 } */ } diff --git a/gcc/testsuite/gcc.dg/cpp/19990413-1.c b/gcc/testsuite/gcc.dg/cpp/19990413-1.c index 17d8441e8e6..c72c3a2eb69 100644 --- a/gcc/testsuite/gcc.dg/cpp/19990413-1.c +++ b/gcc/testsuite/gcc.dg/cpp/19990413-1.c @@ -9,5 +9,5 @@ func(void) { FOO(i = 4) - else; /* { dg-error "'else' without a previous 'if'" "error on this line" { target *-*-* } { 12 } } */ + else; /* { dg-error "'else' without a previous 'if'" "error on this line" { target *-*-* } 12 } */ } diff --git a/gcc/testsuite/gcc.dg/cpp/pragma-1.c b/gcc/testsuite/gcc.dg/cpp/pragma-1.c index 7fab02541ae..7b4ee36c520 100644 --- a/gcc/testsuite/gcc.dg/cpp/pragma-1.c +++ b/gcc/testsuite/gcc.dg/cpp/pragma-1.c @@ -7,7 +7,7 @@ main () #pragma unknown { error; - /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } { 9 } } */ - /* { dg-message "function it appears in" "reminder message" { target *-*-* } { 9 } } */ + /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } 9 } */ + /* { dg-message "function it appears in" "reminder message" { target *-*-* } 9 } */ } } diff --git a/gcc/testsuite/gcc.dg/cpp/pragma-2.c b/gcc/testsuite/gcc.dg/cpp/pragma-2.c index 921f4e5eb40..001365f3024 100644 --- a/gcc/testsuite/gcc.dg/cpp/pragma-2.c +++ b/gcc/testsuite/gcc.dg/cpp/pragma-2.c @@ -11,6 +11,6 @@ int main () { #pragma unknown {} error; - /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } { 13 } } */ - /* { dg-message "function it appears in" "reminder message" { target *-*-* } { 13 } } */ + /* { dg-error "undeclared" "undeclared-variable message" { target *-*-* } 13 } */ + /* { dg-message "function it appears in" "reminder message" { target *-*-* } 13 } */ } diff --git a/gcc/testsuite/gcc.dg/m-un-2.c b/gcc/testsuite/gcc.dg/m-un-2.c index 0b96628355b..882ae885693 100644 --- a/gcc/testsuite/gcc.dg/m-un-2.c +++ b/gcc/testsuite/gcc.dg/m-un-2.c @@ -15,8 +15,8 @@ struct vtable { struct vtable mtable = { malloc, free -}; /* { dg-warning "missing initializer" "warning regression" { target *-*-* } {18} } */ - /* { dg-message "declared here" "warning regression 2" { target *-*-* } {12} } */ +}; /* { dg-warning "missing initializer" "warning regression" { target *-*-* } 18 } */ + /* { dg-message "declared here" "warning regression 2" { target *-*-* } 12 } */ /* With designated initializers, we assume you meant to leave out the initialization of any blank fields. */ diff --git a/gcc/testsuite/objc.dg/private-1.m b/gcc/testsuite/objc.dg/private-1.m index a11183c8ea6..790ba19cfb5 100644 --- a/gcc/testsuite/objc.dg/private-1.m +++ b/gcc/testsuite/objc.dg/private-1.m @@ -35,7 +35,7 @@ { /* Private variables simply don't exist in the subclass. */ private = 12; /* { dg-error "instance variable" } */ - /* { dg-message "function it appears in" "" { target *-*-* } { 37 } } */ + /* { dg-message "function it appears in" "" { target *-*-* } 37 } */ protected = 12; /* Ok */ public = 12; /* Ok */ -- 2.30.2