diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/compat/struct-layout-1_generate.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/compat/struct-layout-1_main.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/compat.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc-defs.exp | 5 |
5 files changed, 22 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6f5dfa9..c7c1e58 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,14 @@ 2009-03-19 Jakub Jelinek <jakub@redhat.com> + Janis Johnson <janis187@us.ibm.com> + + * lib/compat.exp (compat-get-options-main, compat-get-options): + Handle dg-prune-output in source file. + * lib/gcc-defs.exp (${tool}_check_compile): Process prune requests. + * gcc.dg/compat/struct-layout-1_main.c: Use dg-prune for warning. + * gcc.dg/compat/struct-layout-1_generate.c: Use -Wno-abi, prune + two warnings. + +2009-03-19 Jakub Jelinek <jakub@redhat.com> PR c/39495 * gcc.dg/gomp/pr39495-1.c: New test. diff --git a/gcc/testsuite/gcc.dg/compat/struct-layout-1_generate.c b/gcc/testsuite/gcc.dg/compat/struct-layout-1_generate.c index 2e2943d..f563c27 100644 --- a/gcc/testsuite/gcc.dg/compat/struct-layout-1_generate.c +++ b/gcc/testsuite/gcc.dg/compat/struct-layout-1_generate.c @@ -44,6 +44,7 @@ along with GCC; see the file COPYING3. If not see const char *dg_options[] = { "/* { dg-options \"%s-I%s\" } */\n", +"/* { dg-options \"%s-I%s -Wno-abi\" } */\n", "/* { dg-options \"%s-I%s -mno-mmx -Wno-abi\" { target i?86-*-* x86_64-*-* } } */\n", "/* { dg-options \"%s-I%s -fno-common\" { target hppa*-*-hpux* powerpc*-*-darwin* *-*-mingw32* *-*-cygwin* } } */\n", "/* { dg-options \"%s-I%s -mno-mmx -fno-common -Wno-abi\" { target i?86-*-darwin* x86_64-*-darwin* } } */\n", @@ -789,6 +790,8 @@ switchfiles (int fields) fprintf (outfile, "/* { dg-require-effective-target int32plus } */\n"); for (i = 0; i < NDG_OPTIONS; i++) fprintf (outfile, dg_options[i], "", srcdir_safe); + fprintf (outfile, "/* { dg-prune-output \".*-Wno-abi.*\" } */\n"); + fprintf (outfile, "/* { dg-prune-output \".*Offset of packed bit-field.*\" } */\n"); fprintf (outfile, "\ #include \"struct-layout-1.h\"\n\ \n\ diff --git a/gcc/testsuite/gcc.dg/compat/struct-layout-1_main.c b/gcc/testsuite/gcc.dg/compat/struct-layout-1_main.c index 0a2fb42..b59453e 100644 --- a/gcc/testsuite/gcc.dg/compat/struct-layout-1_main.c +++ b/gcc/testsuite/gcc.dg/compat/struct-layout-1_main.c @@ -1,3 +1,5 @@ +/* { dg-prune-output ".*-Wno-abi.*" } */ + #include "struct-layout-1.h" #define TX(n, type, attrs, fields, ops) extern void test##n (void); diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp index 049e5a2..a4ec360 100644 --- a/gcc/testsuite/lib/compat.exp +++ b/gcc/testsuite/lib/compat.exp @@ -170,6 +170,7 @@ proc compat-get-options-main { src } { foreach op $tmp { set cmd [lindex $op 0] if { ![string compare "dg-options" $cmd] \ + || [string match "dg-prune-output" $cmd] \ || [string match "dg-skip-if" $cmd] \ || [string match "dg-require-*" $cmd] } { set status [catch "$op" errmsg] @@ -215,6 +216,7 @@ proc compat-get-options { src } { foreach op $tmp { set cmd [lindex $op 0] if { ![string compare "dg-options" $cmd] \ + || ![string compare "dg-prune-output" $cmd] \ || ![string compare "dg-xfail-if" $cmd] } { set status [catch "$op" errmsg] if { $status != 0 } { diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp index 0570f41..7bcbcab 100644 --- a/gcc/testsuite/lib/gcc-defs.exp +++ b/gcc/testsuite/lib/gcc-defs.exp @@ -49,6 +49,11 @@ proc ${tool}_check_compile {testcase option objname gcc_output} { set gcc_output [prune_warnings $gcc_output] + if { [info proc ${tool}-dg-prune] != "" } { + global target_triplet + set gcc_output [${tool}-dg-prune $target_triplet $gcc_output] + } + set unsupported_message [${tool}_check_unsupported_p $gcc_output] if { $unsupported_message != "" } { unsupported "$testcase: $unsupported_message" |