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, 21 insertions, 21 deletions

diff --git a/gcc/testsuite/gcc.dg/declspec-10.c b/gcc/testsuite/gcc.dg/declspec-10.c
index 5a76764..d29fb7a 100644
--- a/gcc/testsuite/gcc.dg/declspec-10.c
+++ b/gcc/testsuite/gcc.dg/declspec-10.c
@@ -5,41 +5,41 @@
 /* { dg-do compile } */
 /* { dg-options "-pedantic" } */
 
-auto void f0 (void) {} /* { dg-warning "warning: function definition declared 'auto'" } */
-register void f1 (void) {} /* { dg-error "error: function definition declared 'register'" } */
-typedef void f2 (void) {} /* { dg-error "error: function definition declared 'typedef'" } */
+auto void f0 (void) {} /* { dg-warning "function definition declared 'auto'" } */
+register void f1 (void) {} /* { dg-error "function definition declared 'register'" } */
+typedef void f2 (void) {} /* { dg-error "function definition declared 'typedef'" } */
 
-void f3 (auto int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
-void f4 (extern int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
+void f3 (auto int); /* { dg-error "storage class specified for parameter 'type name'" } */
+void f4 (extern int); /* { dg-error "storage class specified for parameter 'type name'" } */
 void f5 (register int);
-void f6 (static int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
-void f7 (typedef int); /* { dg-error "error: storage class specified for parameter 'type name'" } */
+void f6 (static int); /* { dg-error "storage class specified for parameter 'type name'" } */
+void f7 (typedef int); /* { dg-error "storage class specified for parameter 'type name'" } */
 
-auto int x; /* { dg-error "error: file-scope declaration of 'x' specifies 'auto'" } */
-register int y; /* { dg-warning "warning: file-scope declaration of 'y' specifies 'register'" } */
+auto int x; /* { dg-error "file-scope declaration of 'x' specifies 'auto'" } */
+register int y; /* { dg-warning "file-scope declaration of 'y' specifies 'register'" } */
 
-void h (void) { extern void x (void) {} } /* { dg-error "error: nested function 'x' declared 'extern'" } */
-/* { dg-warning "warning: ISO C forbids nested functions" "nested" { target *-*-* } 21 } */
+void h (void) { extern void x (void) {} } /* { dg-error "nested function 'x' declared 'extern'" } */
+/* { dg-warning "ISO C forbids nested functions" "nested" { target *-*-* } 21 } */
 
 void
 g (void)
 {
-  void a; /* { dg-error "error: variable or field 'a' declared void" } */
-  const void b; /* { dg-error "error: variable or field 'b' declared void" } */
-  static void c; /* { dg-error "error: variable or field 'c' declared void" } */
+  void a; /* { dg-error "variable or field 'a' declared void" } */
+  const void b; /* { dg-error "variable or field 'b' declared void" } */
+  static void c; /* { dg-error "variable or field 'c' declared void" } */
 }
 
 void p;
 const void p1;
 extern void q;
 extern const void q1;
-static void r; /* { dg-error "error: variable or field 'r' declared void" } */
-static const void r1; /* { dg-error "error: variable or field 'r1' declared void" } */
+static void r; /* { dg-error "variable or field 'r' declared void" } */
+static const void r1; /* { dg-error "variable or field 'r1' declared void" } */
 
-register void f8 (void); /* { dg-error "error: invalid storage class for function 'f8'" } */
-/* { dg-warning "warning: file-scope declaration of 'f8' specifies 'register'" "register function" { target *-*-* } 39 } */
+register void f8 (void); /* { dg-error "invalid storage class for function 'f8'" } */
+/* { dg-warning "file-scope declaration of 'f8' specifies 'register'" "register function" { target *-*-* } 39 } */
 
-void i (void) { auto void y (void) {} } /* { dg-warning "warning: ISO C forbids nested functions" } */
-/* { dg-warning "warning: function definition declared 'auto'" "nested" { target *-*-* } 42 } */
+void i (void) { auto void y (void) {} } /* { dg-warning "ISO C forbids nested functions" } */
+/* { dg-warning "function definition declared 'auto'" "nested" { target *-*-* } 42 } */
 
-inline int main (void) { return 0; } /* { dg-warning "warning: cannot inline function 'main'" } */
+inline int main (void) { return 0; } /* { dg-warning "cannot inline function 'main'" } */