PR52665 do not let .ident confuse assembler scan tests

Message ID	1466278273-7014-1-git-send-email-rep.dot.nop@gmail.com
State	New
Headers	show Return-Path: <gcc-patches-return-430079-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=FUSdfGKQ5bR7 QoRjVmeUIwiJdPSbYtw7obU7ref3u86xck0KLZlGAc7hTfRbIXznsgvqM5PqAlx8 UBFQtQ6ZoOrZEs279P71beCtUD1qADJf+LFwZxDZSrvRXgHY74GN65HUgtC0CLql EOhrV1fJDrMfdN8YqhDKFU6IMvvN5rE= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> To: gcc-patches@gcc.gnu.org Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, Mike Stump <mikestump@comcast.net>, Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Subject: [PATCH] PR52665 do not let .ident confuse assembler scan tests Date: Sat, 18 Jun 2016 21:31:13 +0200 Message-Id: <1466278273-7014-1-git-send-email-rep.dot.nop@gmail.com>

diff --git a/gcc/testsuite/c-c++-common/ident-0a.c b/gcc/testsuite/c-c++-common/ident-0a.c new file mode 100644 index 0000000..900d206 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-0a.c @@ -0,0 +1,6 @@ +/* PR testsuite/52665 + * Make sure scan-assembler-not turns off .ident */ +/* { dg-do compile } */ +int i; + +/* { dg-final { scan-assembler-not "GCC: " } } */ diff --git a/gcc/testsuite/c-c++-common/ident-0b.c b/gcc/testsuite/c-c++-common/ident-0b.c new file mode 100644 index 0000000..e08126d --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-0b.c @@ -0,0 +1,10 @@ +/* PR testsuite/52665 + * Make sure scan-assembler-not turns off .ident unless -fident in testcase */ +/* { dg-do compile } */ +/* { dg-options "-fident" } */ +int i; + +/* { dg-final { scan-assembler-not "GCC: " { xfail *-*-* } } } */ +/* The testsuite saw scan-assembler-not and turned off .ident so the above + * has to fail for proper operation since the testsuite itself forced + * -fident on again. */ diff --git a/gcc/testsuite/c-c++-common/ident-1a.c b/gcc/testsuite/c-c++-common/ident-1a.c new file mode 100644 index 0000000..867ee43 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-1a.c @@ -0,0 +1,8 @@ +/* PR testsuite/52665 + * Make sure scan-assembler turns off .ident */ +/* { dg-do compile } */ +int i; + +/* { dg-final { scan-assembler "GCC: " { xfail *-*-* } } } */ +/* The testsuite saw scan-assembler and turned off .ident so the above + * has to fail for proper operation. */ diff --git a/gcc/testsuite/c-c++-common/ident-1b.c b/gcc/testsuite/c-c++-common/ident-1b.c new file mode 100644 index 0000000..2431086 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-1b.c @@ -0,0 +1,7 @@ +/* PR testsuite/52665 + * Make sure scan-assembler turns off .ident unless -fident in testcase */ +/* { dg-do compile } */ +/* { dg-options "-fident" } */ +int i; + +/* { dg-final { scan-assembler "GCC: " } } */ diff --git a/gcc/testsuite/c-c++-common/ident-2a.c b/gcc/testsuite/c-c++-common/ident-2a.c new file mode 100644 index 0000000..131b867 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-2a.c @@ -0,0 +1,6 @@ +/* PR testsuite/52665 + * Make sure scan-assembler-times turns off .ident */ +/* { dg-do compile } */ +int i; + +/* { dg-final { scan-assembler-times "GCC: " 0 } } */ /* internal test, keep -times 0 ! */ diff --git a/gcc/testsuite/c-c++-common/ident-2b.c b/gcc/testsuite/c-c++-common/ident-2b.c new file mode 100644 index 0000000..a21e25f --- /dev/null +++ b/gcc/testsuite/c-c++-common/ident-2b.c @@ -0,0 +1,7 @@ +/* PR testsuite/52665 + * Make sure scan-assembler-times turns off .ident unless -fident in testcase */ +/* { dg-do compile } */ +/* { dg-options "-fident" } */ +int ident; + +/* { dg-final { scan-assembler-times "GCC: " 1 } } */ diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 7039140..081b1a8 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -270,9 +270,11 @@ proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { foreach x [split $finalcode "\n"] { set finalcmd [lindex $x 0] if { [info procs ${finalcmd}_required_options] != "" } { - set req [${finalcmd}_required_options] - if { $req != "" && [lsearch -exact $extra_tool_flags $req] == -1 } { - lappend extra_tool_flags $req + foreach req [${finalcmd}_required_options] { + if { $req != "" + && [lsearch -exact $extra_tool_flags $req] == -1 } { + lappend extra_tool_flags $req + } } } } diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 07b8f7d..a368474 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -212,11 +212,11 @@ proc scan-ada-spec-not { args } { # Call pass if pattern is present given number of times, otherwise fail. proc scan-assembler-times { args } { if { [llength $args] < 2 } { - error "scan-assembler: too few arguments" + error "scan-assembler-times: too few arguments" return } if { [llength $args] > 3 } { - error "scan-assembler: too many arguments" + error "scan-assembler-times: too many arguments" return } if { [llength $args] >= 3 } { diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index ef5271a..d9ac988 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -6910,6 +6910,12 @@ proc force_conventional_output_for { test } { } proc ${test}_required_options {} { global gcc_force_conventional_output + upvar 1 extra_tool_flags extra_tool_flags + if {[regexp -- "^scan-assembler" [info level 0]] + && ![string match "*-fident*" $extra_tool_flags]} { + # Do not let .ident confuse assembler scan tests + return [list $gcc_force_conventional_output "-fno-ident"] + } return $gcc_force_conventional_output } }

PR52665 do not let .ident confuse assembler scan tests

Commit Message

Comments

Patch