re PR testsuite/25241 ([C++] DejaGNU does not distinguish between errors and warnings)

2007-07-12  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
	    Janis Johnson  <janis187@us.ibm.com>

	PR testsuite/25241
gcc/testsuite/
	* gcc.test-framework/dg-error-exp-F.c: New test.
	* gcc.test-framework/dg-warning-exp-F.c: New test.
	* lib/gcc.exp: Enable warning and error prefixes.
	* lib/gcc-dg.exp (dg-warning): Wrap original dg-warning.
	(dg-error): Wrap original dg-error.
	* gcc.target/powerpc/altivec-types-1.c: Remove explicit error/warning
	markers from dg-error/dg-warning directives.
	* gcc.dg/20040322-1.c: Likewise.
	* gcc.dg/Wchar-subscripts-1.c: Likewise.
	* gcc.dg/Wdeclaration-after-statement-1.c: Likewise.
	* gcc.dg/Wdeclaration-after-statement-2.c: Likewise.
	* gcc.dg/Werror-1.c: Likewise.
	* gcc.dg/Werror-10.c: Likewise.
	* gcc.dg/Werror-11.c: Likewise.
	* gcc.dg/Werror-2.c: Likewise.
	* gcc.dg/Werror-3.c: Likewise.
	* gcc.dg/Werror-4.c: Likewise.
	* gcc.dg/Werror-5.c: Likewise.
	* gcc.dg/Werror-6.c: Likewise.
	* gcc.dg/Werror-7.c: Likewise.
	* gcc.dg/Werror-8.c: Likewise.
	* gcc.dg/Werror-9.c: Likewise.
	* gcc.dg/Werror-implicit-function-declaration.c: Likewise.
	* gcc.dg/Wimplicit-function-declaration-c89-pedantic.c: Likewise.
	* gcc.dg/Wimplicit-function-declaration-c89.c: Likewise.
	* gcc.dg/Wimplicit-function-declaration-c99-pedantic.c: Likewise.
	* gcc.dg/Wimplicit-function-declaration-c99.c: Likewise.
	* gcc.dg/Wint-to-pointer-cast-1.c: Likewise.
	* gcc.dg/Wint-to-pointer-cast-2.c: Likewise.
	* gcc.dg/Wint-to-pointer-cast-3.c: Likewise.
	* gcc.dg/Wnested-externs-1.c: Likewise.
	* gcc.dg/Wpointer-to-int-cast-1.c: Likewise.
	* gcc.dg/Wpointer-to-int-cast-2.c: Likewise.
	* gcc.dg/Wpointer-to-int-cast-3.c: Likewise.
	* gcc.dg/Wshadow-3.c: Likewise.
	* gcc.dg/Wtraditional-conversion-2.c: Likewise.
	* gcc.dg/Wwrite-strings-1.c: Likewise.
	* gcc.dg/anon-struct-5.c: Likewise.
	* gcc.dg/anon-struct-6.c: Likewise.
	* gcc.dg/anon-struct-7.c: Likewise.
	* gcc.dg/anon-struct-8.c: Likewise.
	* gcc.dg/array-8.c: Likewise.
	* gcc.dg/array-quals-2.c: Likewise.
	* gcc.dg/asm-qual-1.c: Likewise.
	* gcc.dg/asm-wide-1.c: Likewise.
	* gcc.dg/assign-warn-1.c: Likewise.
	* gcc.dg/assign-warn-2.c: Likewise.
	* gcc.dg/bitfld-10.c: Likewise.
	* gcc.dg/bitfld-11.c: Likewise.
	* gcc.dg/bitfld-12.c: Likewise.
	* gcc.dg/bitfld-13.c: Likewise.
	* gcc.dg/bitfld-14.c: Likewise.
	* gcc.dg/builtin-choose-expr-2.c: Likewise.
	* gcc.dg/builtins-30.c: Likewise.
	* gcc.dg/c90-const-expr-5.c: Likewise.
	* gcc.dg/c90-typespec-1.c: Likewise.
	* gcc.dg/c99-const-expr-5.c: Likewise.
	* gcc.dg/c99-flex-array-5.c: Likewise.
	* gcc.dg/c99-fordecl-3.c: Likewise.
	* gcc.dg/c99-tag-3.c: Likewise.
	* gcc.dg/c99-typespec-1.c: Likewise.
	* gcc.dg/c99-vla-jump-1.c: Likewise.
	* gcc.dg/c99-vla-jump-2.c: Likewise.
	* gcc.dg/c99-vla-jump-3.c: Likewise.
	* gcc.dg/c99-vla-jump-4.c: Likewise.
	* gcc.dg/c99-vla-jump-5.c: Likewise.
	* gcc.dg/cast-1.c: Likewise.
	* gcc.dg/cast-2.c: Likewise.
	* gcc.dg/cast-3.c: Likewise.
	* gcc.dg/cast-4.c: Likewise.
	* gcc.dg/cast-pretty-print-1.c: Likewise.
	* gcc.dg/comp-goto-2.c: Likewise.
	* gcc.dg/comp-goto-3.c: Likewise.
	* gcc.dg/cpp/error-1.c: Likewise.
	* gcc.dg/cpp/if-paren.c: Likewise.
	* gcc.dg/decl-7.c: Likewise.
	* gcc.dg/decl-8.c: Likewise.
	* gcc.dg/decl-nospec-1.c: Likewise.
	* gcc.dg/decl-nospec-2.c: Likewise.
	* gcc.dg/decl-nospec-3.c: Likewise.
	* gcc.dg/declspec-10.c: Likewise.
	* gcc.dg/declspec-11.c: Likewise.
	* gcc.dg/declspec-12.c: Likewise.
	* gcc.dg/declspec-13.c: Likewise.
	* gcc.dg/declspec-14.c: Likewise.
	* gcc.dg/declspec-15.c: Likewise.
	* gcc.dg/declspec-16.c: Likewise.
	* gcc.dg/declspec-17.c: Likewise.
	* gcc.dg/declspec-4.c: Likewise.
	* gcc.dg/declspec-5.c: Likewise.
	* gcc.dg/declspec-6.c: Likewise.
	* gcc.dg/declspec-7.c: Likewise.
	* gcc.dg/declspec-8.c: Likewise.
	* gcc.dg/declspec-9.c: Likewise.
	* gcc.dg/dfp/Wtraditional-conversion-2.c: Likewise.
	* gcc.dg/dfp/constants-c99.c: Likewise.
	* gcc.dg/dfp/keywords-c89.c: Likewise.
	* gcc.dg/dfp/keywords-c99.c: Likewise.
	* gcc.dg/dfp/keywords-reserved.c: Likewise.
	* gcc.dg/dfp/typespec.c: Likewise.
	* gcc.dg/dremf-type-compat-2.c: Likewise.
	* gcc.dg/dremf-type-compat-3.c: Likewise.
	* gcc.dg/dremf-type-compat-4.c: Likewise.
	* gcc.dg/empty-source-2.c: Likewise.
	* gcc.dg/empty-source-3.c: Likewise.
	* gcc.dg/enum3.c: Likewise.
	* gcc.dg/extra-semi-2.c: Likewise.
	* gcc.dg/extra-semi-3.c: Likewise.
	* gcc.dg/float-range-1.c: Likewise.
	* gcc.dg/float-range-2.c: Likewise.
	* gcc.dg/float-range-3.c: Likewise.
	* gcc.dg/float-range-5.c: Likewise.
	* gcc.dg/format/asm_fprintf-2.c: Likewise.
	* gcc.dg/format/asm_fprintf-3.c: Likewise.
	* gcc.dg/format/asm_fprintf-4.c: Likewise.
	* gcc.dg/format/asm_fprintf-5.c: Likewise.
	* gcc.dg/format/cast-1.c: Likewise.
	* gcc.dg/format/gcc_diag-3.c: Likewise.
	* gcc.dg/format/gcc_diag-4.c: Likewise.
	* gcc.dg/format/gcc_diag-6.c: Likewise.
	* gcc.dg/format/gcc_diag-8.c: Likewise.
	* gcc.dg/format/gcc_diag-9.c: Likewise.
	* gcc.dg/format/nul-2.c: Likewise.
	* gcc.dg/format/opt-1.c: Likewise.
	* gcc.dg/format/opt-2.c: Likewise.
	* gcc.dg/format/opt-3.c: Likewise.
	* gcc.dg/format/opt-4.c: Likewise.
	* gcc.dg/format/opt-5.c: Likewise.
	* gcc.dg/format/opt-6.c: Likewise.
	* gcc.dg/framework-2.c: Likewise.
	* gcc.dg/func-args-1.c: Likewise.
	* gcc.dg/func-outside-1.c: Likewise.
	* gcc.dg/func-outside-2.c: Likewise.
	* gcc.dg/gnu-cond-expr-2.c: Likewise.
	* gcc.dg/gnu-cond-expr-3.c: Likewise.
	* gcc.dg/if-empty-1.c: Likewise.
	* gcc.dg/init-bad-1.c: Likewise.
	* gcc.dg/init-bad-2.c: Likewise.
	* gcc.dg/init-bad-3.c: Likewise.
	* gcc.dg/init-desig-obs-2.c: Likewise.
	* gcc.dg/init-desig-obs-3.c: Likewise.
	* gcc.dg/init-empty-2.c: Likewise.
	* gcc.dg/init-empty-3.c: Likewise.
	* gcc.dg/inline-11.c: Likewise.
	* gcc.dg/inline-12.c: Likewise.
	* gcc.dg/inline-8.c: Likewise.
	* gcc.dg/inline-9.c: Likewise.
	* gcc.dg/inline3.c: Likewise.
	* gcc.dg/label-decl-1.c: Likewise.
	* gcc.dg/label-decl-2.c: Likewise.
	* gcc.dg/label-decl-3.c: Likewise.
	* gcc.dg/label-decl-4.c: Likewise.
	* gcc.dg/long-long-typespec-1.c: Likewise.
	* gcc.dg/lvalue-2.c: Likewise.
	* gcc.dg/lvalue-3.c: Likewise.
	* gcc.dg/nested-func-3.c: Likewise.
	* gcc.dg/nested-redef-1.c: Likewise.
	* gcc.dg/noreturn-4.c: Likewise.
	* gcc.dg/old-style-prom-2.c: Likewise.
	* gcc.dg/old-style-prom-3.c: Likewise.
	* gcc.dg/old-style-then-proto-1.c: Likewise.
	* gcc.dg/overflow-warn-1.c: Likewise.
	* gcc.dg/overflow-warn-2.c: Likewise.
	* gcc.dg/overflow-warn-3.c: Likewise.
	* gcc.dg/overflow-warn-4.c: Likewise.
	* gcc.dg/overflow-warn-6.c: Likewise.
	* gcc.dg/parm-forwdecl-2.c: Likewise.
	* gcc.dg/parm-forwdecl-3.c: Likewise.
	* gcc.dg/parm-impl-decl-1.c: Likewise.
	* gcc.dg/parm-impl-decl-2.c: Likewise.
	* gcc.dg/parm-incomplete-1.c: Likewise.
	* gcc.dg/parm-mismatch-1.c: Likewise.
	* gcc.dg/pointer-arith-1.c: Likewise.
	* gcc.dg/pointer-arith-2.c: Likewise.
	* gcc.dg/pointer-arith-3.c: Likewise.
	* gcc.dg/pointer-arith-4.c: Likewise.
	* gcc.dg/pointer-arith-6.c: Likewise.
	* gcc.dg/pointer-arith-7.c: Likewise.
	* gcc.dg/pointer-arith-8.c: Likewise.
	* gcc.dg/pr13804-1.c: Likewise.
	* gcc.dg/pr15698-1.c: Likewise.
	* gcc.dg/pr15698-2.c: Likewise.
	* gcc.dg/pr15698-3.c: Likewise.
	* gcc.dg/pr15698-4.c: Likewise.
	* gcc.dg/pr15698-5.c: Likewise.
	* gcc.dg/pr15698-6.c: Likewise.
	* gcc.dg/pr15698-7.c: Likewise.
	* gcc.dg/pr15698-8.c: Likewise.
	* gcc.dg/pr17188-1.c: Likewise.
	* gcc.dg/pr17301-1.c: Likewise.
	* gcc.dg/pr17301-2.c: Likewise.
	* gcc.dg/pr17730-1.c: Likewise.
	* gcc.dg/pr20368-1.c: Likewise.
	* gcc.dg/pr20368-2.c: Likewise.
	* gcc.dg/pr20368-3.c: Likewise.
	* gcc.dg/pr22308-1.c: Likewise.
	* gcc.dg/qual-component-1.c: Likewise.
	* gcc.dg/redecl-1.c: Likewise.
	* gcc.dg/redecl-11.c: Likewise.
	* gcc.dg/redecl-12.c: Likewise.
	* gcc.dg/redecl-13.c: Likewise.
	* gcc.dg/redecl-14.c: Likewise.
	* gcc.dg/redecl-15.c: Likewise.
	* gcc.dg/register-var-1.c: Likewise.
	* gcc.dg/register-var-2.c: Likewise.
	* gcc.dg/stmt-expr-2.c: Likewise.
	* gcc.dg/stmt-expr-3.c: Likewise.
	* gcc.dg/stmt-expr-label-1.c: Likewise.
	* gcc.dg/stmt-expr-label-2.c: Likewise.
	* gcc.dg/stmt-expr-label-3.c: Likewise.
	* gcc.dg/struct-empty-2.c: Likewise.
	* gcc.dg/struct-empty-3.c: Likewise.
	* gcc.dg/struct-parse-1.c: Likewise.
	* gcc.dg/struct-semi-1.c: Likewise.
	* gcc.dg/struct-semi-2.c: Likewise.
	* gcc.dg/struct-semi-3.c: Likewise.
	* gcc.dg/switch-5.c: Likewise.
	* gcc.dg/switch-6.c: Likewise.
	* gcc.dg/switch-7.c: Likewise.
	* gcc.dg/tls/diag-5.c: Likewise.
	* gcc.dg/transparent-union-1.c: Likewise.
	* gcc.dg/transparent-union-3.c: Likewise.
	* gcc.dg/typespec-1.c: Likewise.
	* gcc.dg/vla-init-2.c: Likewise.
	* gcc.dg/vla-init-3.c: Likewise.
	* gcc.dg/vla-init-4.c: Likewise.
	* gcc.dg/vla-init-5.c: Likewise.
	* gcc.dg/void-cast-2.c: Likewise.
	* gcc.dg/wvla-3.c: Likewise.
	* gcc.dg/wvla-7.c: Likewise.
	* gcc.target/i386/991209-1.c: Likewise.
	* gcc.target/ia64/fpreg-1.c: Likewise.
	* gcc.target/m68k/interrupt_thread-2.c: Likewise.
	* gcc.target/m68k/interrupt_thread-3.c: Likewise.

From-SVN: r126606

1 files changed, 20 insertions, 20 deletions

diff --git a/gcc/testsuite/gcc.dg/declspec-13.c b/gcc/testsuite/gcc.dg/declspec-13.c
index 3172520..a325c0d 100644
--- a/gcc/testsuite/gcc.dg/declspec-13.c
+++ b/gcc/testsuite/gcc.dg/declspec-13.c
@@ -6,27 +6,27 @@
 
 /* typeof should act much like typedef, so the following are
    invalid.  */
-typeof(double) long x0; /* { dg-error "error: two or more data types in declaration specifiers" } */
-typeof(double) _Complex x1; /* { dg-error "error: two or more data types in declaration specifiers" } */
+typeof(double) long x0; /* { dg-error "two or more data types in declaration specifiers" } */
+typeof(double) _Complex x1; /* { dg-error "two or more data types in declaration specifiers" } */
 
 /* The following is erroneous, and used to get a bogus message about
    complex integer types.  */
 typedef double D;
-D _Complex x2; /* { dg-error "error: two or more data types in declaration specifiers" } */
+D _Complex x2; /* { dg-error "two or more data types in declaration specifiers" } */
 
 /* The following empty declarations should have problems in their type
    specifiers diagnosed, not just the general problem that they are
    empty declarations.  */
-long short; /* { dg-error "error: both 'long' and 'short' in declaration specifiers" } */
-/* { dg-warning "warning: useless type name in empty declaration" "empty" { target *-*-* } 20 } */
-_Complex double; /* { dg-warning "warning: ISO C90 does not support complex types" } */
-/* { dg-warning "warning: useless type name in empty declaration" "empty" { target *-*-* } 22 } */
-_Complex; /* { dg-warning "warning: ISO C90 does not support complex types" } */
-/* { dg-warning "warning: ISO C does not support plain 'complex' meaning 'double complex'" "ISO C" { target *-*-* } 24 } */
-/* { dg-warning "warning: useless type name in empty declaration" "empty" { target *-*-* } 24 } */
-_Complex int; /* { dg-warning "warning: ISO C90 does not support complex types" } */
-/* { dg-warning "warning: ISO C does not support complex integer types" "ISO C" { target *-*-* } 27 } */
-/* { dg-warning "warning: useless type name in empty declaration" "empty" { target *-*-* } 27 } */
+long short; /* { dg-error "both 'long' and 'short' in declaration specifiers" } */
+/* { dg-warning "useless type name in empty declaration" "empty" { target *-*-* } 20 } */
+_Complex double; /* { dg-warning "ISO C90 does not support complex types" } */
+/* { dg-warning "useless type name in empty declaration" "empty" { target *-*-* } 22 } */
+_Complex; /* { dg-warning "ISO C90 does not support complex types" } */
+/* { dg-warning "ISO C does not support plain 'complex' meaning 'double complex'" "ISO C" { target *-*-* } 24 } */
+/* { dg-warning "useless type name in empty declaration" "empty" { target *-*-* } 24 } */
+_Complex int; /* { dg-warning "ISO C90 does not support complex types" } */
+/* { dg-warning "ISO C does not support complex integer types" "ISO C" { target *-*-* } 27 } */
+/* { dg-warning "useless type name in empty declaration" "empty" { target *-*-* } 27 } */
 
 /* Specific messages for each invalid combination.  (That some message
    is given when appropriate for a larger collection of combinations
@@ -55,24 +55,24 @@ _Bool unsigned x22; /* { dg-error "both 'unsigned' and '_Bool' in declaration sp
 float unsigned x23; /* { dg-error "both 'unsigned' and 'float' in declaration specifiers" } */
 double unsigned x24; /* { dg-error "both 'unsigned' and 'double' in declaration specifiers" } */
 void _Complex x25; /* { dg-error "both 'complex' and 'void' in declaration specifiers" } */
-/* { dg-warning "warning: ISO C90 does not support complex types" "C90" { target *-*-* } 57 } */
+/* { dg-warning "ISO C90 does not support complex types" "C90" { target *-*-* } 57 } */
 _Bool _Complex x26; /* { dg-error "both 'complex' and '_Bool' in declaration specifiers" } */
-/* { dg-warning "warning: ISO C90 does not support complex types" "C90" { target *-*-* } 59 } */
+/* { dg-warning "ISO C90 does not support complex types" "C90" { target *-*-* } 59 } */
 
 long void x27; /* { dg-error "both 'long' and 'void' in declaration specifiers" } */
 short void x28; /* { dg-error "both 'short' and 'void' in declaration specifiers" } */
 signed void x29; /* { dg-error "both 'signed' and 'void' in declaration specifiers" } */
 unsigned void x30; /* { dg-error "both 'unsigned' and 'void' in declaration specifiers" } */
 _Complex void x31; /* { dg-error "both 'complex' and 'void' in declaration specifiers" } */
-/* { dg-warning "warning: ISO C90 does not support complex types" "C90" { target *-*-* } 66 } */
-/* { dg-warning "warning: ISO C does not support plain 'complex' meaning 'double complex'" "complex" { target *-*-* } 66 } */
+/* { dg-warning "ISO C90 does not support complex types" "C90" { target *-*-* } 66 } */
+/* { dg-warning "ISO C does not support plain 'complex' meaning 'double complex'" "complex" { target *-*-* } 66 } */
 long _Bool x32; /* { dg-error "both 'long' and '_Bool' in declaration specifiers" } */
 short _Bool x33; /* { dg-error "both 'short' and '_Bool' in declaration specifiers" } */
 signed _Bool x34; /* { dg-error "both 'signed' and '_Bool' in declaration specifiers" } */
 unsigned _Bool x35; /* { dg-error "both 'unsigned' and '_Bool' in declaration specifiers" } */
 _Complex _Bool x36; /* { dg-error "both 'complex' and '_Bool' in declaration specifiers" } */
-/* { dg-warning "warning: ISO C90 does not support complex types" "C90" { target *-*-* } 73 } */
-/* { dg-warning "warning: ISO C does not support plain 'complex' meaning 'double complex'" "complex" { target *-*-* } 73 } */
+/* { dg-warning "ISO C90 does not support complex types" "C90" { target *-*-* } 73 } */
+/* { dg-warning "ISO C does not support plain 'complex' meaning 'double complex'" "complex" { target *-*-* } 73 } */
 long char x37; /* { dg-error "both 'long' and 'char' in declaration specifiers" } */
 short char x38; /* { dg-error "both 'short' and 'char' in declaration specifiers" } */
 long float x39; /* { dg-error "both 'long' and 'float' in declaration specifiers" } */
@@ -80,7 +80,7 @@ short float x40; /* { dg-error "both 'short' and 'float' in declaration specifie
 signed float x41; /* { dg-error "both 'signed' and 'float' in declaration specifiers" } */
 unsigned float x42; /* { dg-error "both 'unsigned' and 'float' in declaration specifiers" } */
 long long double x43; /* { dg-error "both 'long long' and 'double' in declaration specifiers" } */
-/* { dg-warning "warning: ISO C90 does not support 'long long'" "C90" { target *-*-* } 82 } */
+/* { dg-warning "ISO C90 does not support 'long long'" "C90" { target *-*-* } 82 } */
 short double x44; /* { dg-error "both 'short' and 'double' in declaration specifiers" } */
 signed double x45; /* { dg-error "both 'signed' and 'double' in declaration specifiers" } */
 unsigned double x46; /* { dg-error "both 'unsigned' and 'double' in declaration specifiers" } */