* gcc.dg/compare1.c: Add -fno-short-enums. Don't skip on any

	target.
	* gcc.dg/compare9.c: Use -fshort-enums instead of
	-fshort-enums.  Change the last test to dg-bogus.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101610 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 15 insertions, 10 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1f18a2959f3..4805a761840 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-05  Kazu Hirata  <kazu@codesourcery.com>
+
+	* gcc.dg/compare1.c: Add -fno-short-enums.  Don't skip on any
+	target.
+	* gcc.dg/compare9.c: Use -fshort-enums instead of
+	-fshort-enums.  Change the last test to dg-bogus.
+
 2005-07-04  Kazu Hirata  <kazu@codesourcery.com>
 
 	* gcc.dg/compare1.c: Skip on arm*-*-eabi* arm*-*-symbianelf*.
diff --git a/gcc/testsuite/gcc.dg/compare1.c b/gcc/testsuite/gcc.dg/compare1.c
index 06049270c07..17ba3ee2098 100644
--- a/gcc/testsuite/gcc.dg/compare1.c
+++ b/gcc/testsuite/gcc.dg/compare1.c
@@ -1,11 +1,10 @@
 /* Test for a bogus warning on comparison between signed and unsigned.
-   This was inspired by code in gcc. */
+   This was inspired by code in gcc.  This testcase is identical to
+   compare9.c except that we use -fno-short-enums here and expect a
+   warning from case 4.  */
 
 /* { dg-do compile } */
-/* { dg-options "-Wsign-compare" } */
-/* This test would fail on targets with short enums being default.  See
-   compare9.c.  */
-/* { dg-skip-if "" { arm*-*-eabi* arm*-*-symbianelf* }  { "*" } { "" } } */
+/* { dg-options "-fno-short-enums -Wsign-compare" } */
 
 int tf = 1;
 
diff --git a/gcc/testsuite/gcc.dg/compare9.c b/gcc/testsuite/gcc.dg/compare9.c
index e46e0641ade..02150cb1fb6 100644
--- a/gcc/testsuite/gcc.dg/compare9.c
+++ b/gcc/testsuite/gcc.dg/compare9.c
@@ -1,11 +1,10 @@
 /* Test for a bogus warning on comparison between signed and unsigned.
    This was inspired by code in gcc.  This testcase is identical to
-   compare1.c except that we add -fno-short-enums to accomodate
-   targets with short enums being default, such as arm*-*-eabi* and
-   arm*-*-symbianelf*.  */
+   compare1.c except that we use -fshort-enums here and do not expect
+   a warning from case 4.  */
 
 /* { dg-do compile } */
-/* { dg-options "-fno-short-enums -Wsign-compare" } */
+/* { dg-options "-fshort-enums -Wsign-compare" } */
 
 int tf = 1;
 
@@ -38,5 +37,5 @@ int h(enum mm2 x)
 
 int i(enum mm2 x)
 {
-  return x == (tf?DI2:-1); /* { dg-warning "signed and unsigned" "case 4" } */
+  return x == (tf?DI2:-1); /* { dg-bogus "signed and unsigned" "case 4" } */
 }