From 1579e8d23577a56ac499e49a2559509a6bd21e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Thu, 7 Jun 2007 21:01:41 +0000 Subject: [PATCH] re PR testsuite/25241 ([C++] DejaGNU does not distinguish between errors and warnings) 2007-06-07 Manuel Lopez-Ibanez PR testsuite/25241 testsuite/ * gcc.dg/parm-mismatch-1.c: Use dg-message for notes. * gcc.dg/Wfatal.c: Use dg-message for output that is neither a warning nor an error. * gcc.dg/Wfatal-2.c: Likewise. * gcc.dg/Werror-1.c: Likewise. * gcc.dg/Werror-5.c: Likewise. * gcc.dg/Werror-7.c: Likewise. * gcc.dg/Werror-10.c: Likewise. * gcc.dg/Werror-11.c: Likewise. From-SVN: r125543 --- gcc/testsuite/ChangeLog | 13 +++++++++++++ gcc/testsuite/gcc.dg/Werror-1.c | 2 +- gcc/testsuite/gcc.dg/Werror-10.c | 2 +- gcc/testsuite/gcc.dg/Werror-11.c | 2 +- gcc/testsuite/gcc.dg/Werror-5.c | 2 +- gcc/testsuite/gcc.dg/Werror-7.c | 2 +- gcc/testsuite/gcc.dg/Wfatal-2.c | 4 ++-- gcc/testsuite/gcc.dg/Wfatal.c | 2 +- gcc/testsuite/gcc.dg/parm-mismatch-1.c | 8 ++++---- 9 files changed, 25 insertions(+), 12 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0c650e7fa5e..e3157401189 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2007-06-07 Manuel Lopez-Ibanez + + PR testsuite/25241 + * gcc.dg/parm-mismatch-1.c: Use dg-message for notes. + * gcc.dg/Wfatal.c: Use dg-message for output that is neither a + warning nor an error. + * gcc.dg/Wfatal-2.c: Likewise. + * gcc.dg/Werror-1.c: Likewise. + * gcc.dg/Werror-5.c: Likewise. + * gcc.dg/Werror-7.c: Likewise. + * gcc.dg/Werror-10.c: Likewise. + * gcc.dg/Werror-11.c: Likewise. + 2007-06-07 Simon Martin PR c++/30759 diff --git a/gcc/testsuite/gcc.dg/Werror-1.c b/gcc/testsuite/gcc.dg/Werror-1.c index 33fc1d3583c..5c910e11aee 100644 --- a/gcc/testsuite/gcc.dg/Werror-1.c +++ b/gcc/testsuite/gcc.dg/Werror-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-Waddress -Wattributes -Werror" } */ -/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */ +/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */ /* This is the first in a series of test cases that test the interaction between -Wfoo, -Werror, -Werror=foo, and #pragma GCC diff --git a/gcc/testsuite/gcc.dg/Werror-10.c b/gcc/testsuite/gcc.dg/Werror-10.c index f5646545132..79ba79253c9 100644 --- a/gcc/testsuite/gcc.dg/Werror-10.c +++ b/gcc/testsuite/gcc.dg/Werror-10.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-Wattributes -Werror" } */ -/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */ +/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */ /* Make sure #pragma can work with -Werror. */ diff --git a/gcc/testsuite/gcc.dg/Werror-11.c b/gcc/testsuite/gcc.dg/Werror-11.c index 0dea5faf6a8..d47bfb11b22 100644 --- a/gcc/testsuite/gcc.dg/Werror-11.c +++ b/gcc/testsuite/gcc.dg/Werror-11.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-Wattributes -Werror" } */ -/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */ +/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */ /* Make sure #pragma can override -Werror. */ diff --git a/gcc/testsuite/gcc.dg/Werror-5.c b/gcc/testsuite/gcc.dg/Werror-5.c index 8a21593fbd8..b27efbfafda 100644 --- a/gcc/testsuite/gcc.dg/Werror-5.c +++ b/gcc/testsuite/gcc.dg/Werror-5.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-Waddress -Wattributes -Werror" } */ -/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */ +/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */ /* Make sure -Werror turns warnings in to errors. */ diff --git a/gcc/testsuite/gcc.dg/Werror-7.c b/gcc/testsuite/gcc.dg/Werror-7.c index 6a69fae4ded..ad541ecdd44 100644 --- a/gcc/testsuite/gcc.dg/Werror-7.c +++ b/gcc/testsuite/gcc.dg/Werror-7.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-Waddress -Werror -Wno-error=address -Wattributes" } */ -/* { dg-warning "warnings being treated as errors" "" {target "*-*-*"} 0 } */ +/* { dg-message "warnings being treated as errors" "" {target "*-*-*"} 0 } */ /* Make sure -Wno-error= overrides -Werror. */ diff --git a/gcc/testsuite/gcc.dg/Wfatal-2.c b/gcc/testsuite/gcc.dg/Wfatal-2.c index cbb7c8e8ff8..ba76e77bde1 100644 --- a/gcc/testsuite/gcc.dg/Wfatal-2.c +++ b/gcc/testsuite/gcc.dg/Wfatal-2.c @@ -5,5 +5,5 @@ int i = INT_MAX + 1; /* { dg-error "integer overflow in expression" } */ int k = 1 / 0; int j = INT_MIN - 1; -/* { dg-warning "being treated as errors" "" { target *-*-* } 0 } */ -/* { dg-warning "terminated due to -Wfatal-errors" "" { target *-*-* } 0 } */ +/* { dg-message "being treated as errors" "" { target *-*-* } 0 } */ +/* { dg-message "terminated due to -Wfatal-errors" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/Wfatal.c b/gcc/testsuite/gcc.dg/Wfatal.c index bb3efc81369..3a101000dff 100644 --- a/gcc/testsuite/gcc.dg/Wfatal.c +++ b/gcc/testsuite/gcc.dg/Wfatal.c @@ -5,7 +5,7 @@ int i = INT_MAX + 1; /* { dg-warning "integer overflow in expression" } */ int k = 1 / 0; /* { dg-error "division by zero" } */ int j = INT_MIN - 1; -/* { dg-warning "terminated due to -Wfatal-errors" "" { target *-*-* } 0 } */ +/* { dg-message "terminated due to -Wfatal-errors" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/parm-mismatch-1.c b/gcc/testsuite/gcc.dg/parm-mismatch-1.c index 6b82b7be1b2..1cc427dd6b6 100644 --- a/gcc/testsuite/gcc.dg/parm-mismatch-1.c +++ b/gcc/testsuite/gcc.dg/parm-mismatch-1.c @@ -6,13 +6,13 @@ void f0(); /* { dg-error "error: previous declaration of 'f0' was here" } */ void f0(int, ...); /* { dg-error "error: conflicting types for 'f0'" } */ -/* { dg-error "note: a parameter list with an ellipsis can't match an empty parameter name list declaration" "note" { target *-*-* } 8 } */ +/* { dg-message "note: a parameter list with an ellipsis can't match an empty parameter name list declaration" "note" { target *-*-* } 8 } */ void f1(int, ...); /* { dg-error "error: previous declaration of 'f1' was here" } */ void f1(); /* { dg-error "error: conflicting types for 'f1'" } */ -/* { dg-error "note: a parameter list with an ellipsis can't match an empty parameter name list declaration" "note" { target *-*-* } 11 } */ +/* { dg-message "note: a parameter list with an ellipsis can't match an empty parameter name list declaration" "note" { target *-*-* } 11 } */ void f2(); /* { dg-error "error: previous declaration of 'f2' was here" } */ void f2(char); /* { dg-error "error: conflicting types for 'f2'" } */ -/* { dg-error "note: an argument type that has a default promotion can't match an empty parameter name list declaration" "note" { target *-*-* } 14 } */ +/* { dg-message "note: an argument type that has a default promotion can't match an empty parameter name list declaration" "note" { target *-*-* } 14 } */ void f3(char); /* { dg-error "error: previous declaration of 'f3' was here" } */ void f3(); /* { dg-error "error: conflicting types for 'f3'" } */ -/* { dg-error "note: an argument type that has a default promotion can't match an empty parameter name list declaration" "note" { target *-*-* } 17 } */ +/* { dg-message "note: an argument type that has a default promotion can't match an empty parameter name list declaration" "note" { target *-*-* } 17 } */