From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 9BB0D385C017 for ; Thu, 19 Mar 2020 10:03:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9BB0D385C017 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BCCBAAFF3 for ; Thu, 19 Mar 2020 10:03:05 +0000 (UTC) Date: Thu, 19 Mar 2020 11:03:04 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Fix gdb.threads/omp-par-scope.exp XPASS Message-ID: <20200319100302.GA10681@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-25.0 required=5.0 tests=GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2020 10:03:07 -0000 Hi, When running test-case gdb.threads/omp-par-scope.exp, I get this XPASS: ... XPASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: \ outer stop: get valueof "num" ... for test: ... set thread_num [get_valueof "" "num" "unknown"] ... The intention of the test is to get the value of local variable num, which has been set to: ... int num = omp_get_thread_num (); ... but the actually printed value is 'num': ... (gdb) print num^M $76 = num^M ... This is due to the fact that num is missing in the locals, so instead we find the enum member 'num' of enum expression_operator in glibc/intl/plural-exp.h. Fix this by getting the value using a new proc get_local_valueof, which uses the "info locals" commands to get the value. Tested on x86_64-linux, with gcc 7.5.0 (where the test xfails) and gcc 10.0.1 (where the test passes). OK for trunk? Thanks, - Tom [gdb/testsuite] Fix gdb.threads/omp-par-scope.exp XPASS --- gdb/testsuite/gdb.threads/omp-par-scope.exp | 2 +- gdb/testsuite/lib/gdb.exp | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.threads/omp-par-scope.exp b/gdb/testsuite/gdb.threads/omp-par-scope.exp index 16441d3ec6..890696200f 100644 --- a/gdb/testsuite/gdb.threads/omp-par-scope.exp +++ b/gdb/testsuite/gdb.threads/omp-par-scope.exp @@ -273,7 +273,7 @@ with_test_prefix "nested_parallel" { gdb_continue_to_breakpoint "at printf" if {$have_older_gcc} { setup_xfail "*-*-*" } - set thread_num [get_valueof "" "num" "unknown"] + set thread_num [get_local_valueof "num" "unknown"] gdb_test "print file_scope_var" "= 9876" if {$have_older_gcc} { setup_xfail "*-*-*" } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b14b3a968e..e17ac0ef75 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -6173,6 +6173,30 @@ proc get_valueof { fmt exp default {test ""} } { return ${val} } +# Retrieve the value of local var EXP in the inferior. DEFAULT is used as +# fallback if print fails. TEST is the test message to use. It can be +# omitted, in which case a test message is built from EXP. + +proc get_local_valueof { exp default {test ""} } { + global gdb_prompt + + if {$test == "" } { + set test "get local valueof \"${exp}\"" + } + + set val ${default} + gdb_test_multiple "info locals ${exp}" "$test" { + -re "$exp = (\[^\r\n\]*)\[\r\n\]*$gdb_prompt $" { + set val $expect_out(1,string) + pass "$test" + } + timeout { + fail "$test (timeout)" + } + } + return ${val} +} + # Retrieve the value of EXP in the inferior, as a signed decimal value # (using "print /d"). DEFAULT is used as fallback if print fails. # TEST is the test message to use. It can be omitted, in which case