From: pzhao Date: Tue, 27 Apr 2010 08:56:01 +0000 (+0000) Subject: * gcc.dg/pr32207.c: Fix typo in expected warning messages. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b840d417812d0a651a323573a4807889d20a003;p=thirdparty%2Fgcc.git * gcc.dg/pr32207.c: Fix typo in expected warning messages. * gcc.dg/misc-column.c: Likewise. * gcc.dg/Walways-true-1.c: Likewise. * gcc.dg/Walways-true-2.c: Likewise. * gcc.dg/warn-addr-cmp.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158769 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7bc52d16325a..21640d68b03e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-04-27 Shujing Zhao + + * gcc.dg/pr32207.c: Fix typo in expected warning messages. + * gcc.dg/misc-column.c: Likewise. + * gcc.dg/Walways-true-1.c: Likewise. + * gcc.dg/Walways-true-2.c: Likewise. + * gcc.dg/warn-addr-cmp.c: Likewise. + 2010-04-27 Tobias Burnus PR fortran/18918 diff --git a/gcc/testsuite/gcc.dg/Walways-true-1.c b/gcc/testsuite/gcc.dg/Walways-true-1.c index 274ec32b38b7..e4e4596cb44b 100644 --- a/gcc/testsuite/gcc.dg/Walways-true-1.c +++ b/gcc/testsuite/gcc.dg/Walways-true-1.c @@ -26,32 +26,32 @@ bar (int a) foo (5); if (&&lab) /* { dg-warning "7:always evaluate as" "correct warning" } */ foo (6); - if (foo == 0) /* { dg-warning "11:the comparison will always evaluate to 'false'" "correct warning" } */ + if (foo == 0) /* { dg-warning "11:the comparison will always evaluate as 'false'" "correct warning" } */ foo (7); if (foo (1) == 0) foo (8); - if (&i == 0) /* { dg-warning "10:the comparison will always evaluate to 'false'" "correct warning" } */ + if (&i == 0) /* { dg-warning "10:the comparison will always evaluate as 'false'" "correct warning" } */ foo (9); if (i == 0) foo (10); - if (&a == 0) /* { dg-warning "10:the comparison will always evaluate to 'false'" "correct warning" } */ + if (&a == 0) /* { dg-warning "10:the comparison will always evaluate as 'false'" "correct warning" } */ foo (11); if (a == 0) foo (12); - if (&&lab == 0) /* { dg-warning "13:the comparison will always evaluate to 'false'" "correct warning" } */ + if (&&lab == 0) /* { dg-warning "13:the comparison will always evaluate as 'false'" "correct warning" } */ foo (13); - if (0 == foo) /* { dg-warning "9:the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == foo) /* { dg-warning "9:the comparison will always evaluate as 'false'" "correct warning" } */ foo (14); if (0 == foo (1)) foo (15); - if (0 == &i) /* { dg-warning "9:the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == &i) /* { dg-warning "9:the comparison will always evaluate as 'false'" "correct warning" } */ foo (16); if (0 == i) foo (17); - if (0 == &a) /* { dg-warning "9:the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == &a) /* { dg-warning "9:the comparison will always evaluate as 'false'" "correct warning" } */ foo (18); if (0 == a) foo (19); - if (0 == &&lab) /* { dg-warning "9:the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == &&lab) /* { dg-warning "9:the comparison will always evaluate as 'false'" "correct warning" } */ foo (20); } diff --git a/gcc/testsuite/gcc.dg/Walways-true-2.c b/gcc/testsuite/gcc.dg/Walways-true-2.c index 3978a446188d..af40ba65a5ac 100644 --- a/gcc/testsuite/gcc.dg/Walways-true-2.c +++ b/gcc/testsuite/gcc.dg/Walways-true-2.c @@ -37,11 +37,11 @@ bar (int a) foo (9); if (i == 0) foo (10); - if (&a == 0) /* { dg-warning "the comparison will always evaluate to 'false'" "correct warning" } */ + if (&a == 0) /* { dg-warning "the comparison will always evaluate as 'false'" "correct warning" } */ foo (11); if (a == 0) foo (12); - if (&&lab == 0) /* { dg-warning "the comparison will always evaluate to 'false'" "correct warning" } */ + if (&&lab == 0) /* { dg-warning "the comparison will always evaluate as 'false'" "correct warning" } */ foo (13); if (0 == foo) foo (14); @@ -51,10 +51,10 @@ bar (int a) foo (16); if (0 == i) foo (17); - if (0 == &a) /* { dg-warning "the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == &a) /* { dg-warning "the comparison will always evaluate as 'false'" "correct warning" } */ foo (18); if (0 == a) foo (19); - if (0 == &&lab) /* { dg-warning "the comparison will always evaluate to 'false'" "correct warning" } */ + if (0 == &&lab) /* { dg-warning "the comparison will always evaluate as 'false'" "correct warning" } */ foo (20); } diff --git a/gcc/testsuite/gcc.dg/misc-column.c b/gcc/testsuite/gcc.dg/misc-column.c index f69f98884d9e..e68300bfc290 100644 --- a/gcc/testsuite/gcc.dg/misc-column.c +++ b/gcc/testsuite/gcc.dg/misc-column.c @@ -19,7 +19,7 @@ void foo (void) if (p < q) /* { dg-warning "9:comparison of distinct pointer types" } */ bar (); - if (&p == 0) /* { dg-warning "10:comparison will always evaluate to 'false'" } */ + if (&p == 0) /* { dg-warning "10:comparison will always evaluate as 'false'" } */ bar(); if (p == 4) /* { dg-warning "9:comparison between pointer and integer" } */ diff --git a/gcc/testsuite/gcc.dg/pr32207.c b/gcc/testsuite/gcc.dg/pr32207.c index 549d51a9e9d1..cf9bef8099a2 100644 --- a/gcc/testsuite/gcc.dg/pr32207.c +++ b/gcc/testsuite/gcc.dg/pr32207.c @@ -5,5 +5,5 @@ extern void z(); void f() { if ( z ) z(); } /* { dg-warning "always evaluate as" } */ -void g() { if ( z != 0 ) z(); } /* { dg-warning "the comparison will always evaluate to 'true'" } */ -void h() { if ( z != (void*)0 ) z(); } /* { dg-warning "the comparison will always evaluate to 'true'" } */ +void g() { if ( z != 0 ) z(); } /* { dg-warning "the comparison will always evaluate as 'true'" } */ +void h() { if ( z != (void*)0 ) z(); } /* { dg-warning "the comparison will always evaluate as 'true'" } */ diff --git a/gcc/testsuite/gcc.dg/warn-addr-cmp.c b/gcc/testsuite/gcc.dg/warn-addr-cmp.c index c1e68f5c5987..07491d1bb98f 100644 --- a/gcc/testsuite/gcc.dg/warn-addr-cmp.c +++ b/gcc/testsuite/gcc.dg/warn-addr-cmp.c @@ -36,13 +36,13 @@ test_func_cmp (void) int test_func_cmp_rhs_zero (void) { - if (func == 0) /* { dg-warning "the comparison will always evaluate to 'false'" } */ + if (func == 0) /* { dg-warning "the comparison will always evaluate as 'false'" } */ return 1; - if (func != 0) /* { dg-warning "the comparison will always evaluate to 'true'" } */ + if (func != 0) /* { dg-warning "the comparison will always evaluate as 'true'" } */ return 1; - if (&var == 0) /* { dg-warning "the comparison will always evaluate to 'false'" } */ + if (&var == 0) /* { dg-warning "the comparison will always evaluate as 'false'" } */ return 1; - if (&var != 0) /* { dg-warning "the comparison will always evaluate to 'true'" } */ + if (&var != 0) /* { dg-warning "the comparison will always evaluate as 'true'" } */ return 1; if (weak_func == 0) return 1; @@ -59,13 +59,13 @@ test_func_cmp_rhs_zero (void) int test_func_cmp_lhs_zero (void) { - if (0 == func) /* { dg-warning "the comparison will always evaluate to 'false'" } */ + if (0 == func) /* { dg-warning "the comparison will always evaluate as 'false'" } */ return 1; - if (0 != func) /* { dg-warning "the comparison will always evaluate to 'true'" } */ + if (0 != func) /* { dg-warning "the comparison will always evaluate as 'true'" } */ return 1; - if (0 == &var) /* { dg-warning "the comparison will always evaluate to 'false'" } */ + if (0 == &var) /* { dg-warning "the comparison will always evaluate as 'false'" } */ return 1; - if (0 != &var) /* { dg-warning "the comparison will always evaluate to 'true'" } */ + if (0 != &var) /* { dg-warning "the comparison will always evaluate as 'true'" } */ return 1; if (0 == weak_func) return 1;