aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/gcc.dg/Walways-true-1.c16
-rw-r--r--gcc/testsuite/gcc.dg/Walways-true-2.c8
-rw-r--r--gcc/testsuite/gcc.dg/misc-column.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr32207.c4
-rw-r--r--gcc/testsuite/gcc.dg/warn-addr-cmp.c16
6 files changed, 31 insertions, 23 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7bc52d1..21640d6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-27 Shujing Zhao <pearly.zhao@oracle.com>
+
+ * 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 <burnus@net-b.de>
PR fortran/18918
diff --git a/gcc/testsuite/gcc.dg/Walways-true-1.c b/gcc/testsuite/gcc.dg/Walways-true-1.c
index 274ec32..e4e4596 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 3978a44..af40ba6 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 f69f988..e68300b 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 549d51a..cf9bef8 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 c1e68f5..07491d1 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;