From 93674a72309f986c9ace2d6060916053a00da2a1 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Thu, 9 Apr 2020 13:56:44 +0000 Subject: [PATCH] [testsuite] scanasm.exp: Fix target-selector handling in check-function-bodies {target { ! a } } does not work because the greedy regexp extracts "! a }" instead of "target { ! a }". This patch replaces it with a non-greedy regexp. 2020-04-09 Christophe Lyon * lib/scanasm.exp (check-function-bodies): Use non-greedy regexp when extracting the target selector. --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/scanasm.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e01fdb0fe2c..e692a7f6838 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-09 Christophe Lyon + + * lib/scanasm.exp (check-function-bodies): Use non-greedy regexp + when extracting the target selector. + 2020-04-09 Martin Jambor PR tree-optimization/94482 diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 8d2364f93a9..d5f2be47d2f 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -689,7 +689,7 @@ proc check-function-bodies { args } { if { [string equal -length $prefix_len $line $prefix] } { set line [string trim [string range $line $prefix_len end]] if { !$in_function } { - if { [regexp "^(.*\\S)\\s+{(.*)}\$" $line dummy \ + if { [regexp "^(.*?\\S)\\s+{(.*)}\$" $line dummy \ line selector] } { set selector [dg-process-target $selector] } else { -- 2.30.2