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 0530A3875DFD for ; Fri, 20 Mar 2020 14:34:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0530A3875DFD 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 BB0F2ACC3 for ; Fri, 20 Mar 2020 14:34:11 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Fix gdb.threads/omp-par-scope.exp XPASS From: Tom de Vries To: gdb-patches@sourceware.org References: <20200319100302.GA10681@delia> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <1cd4b846-ba36-e742-91c3-078f79549566@suse.de> Date: Fri, 20 Mar 2020 15:34:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200319100302.GA10681@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00, 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: Fri, 20 Mar 2020 14:34:14 -0000 On 19-03-2020 11:03, Tom de Vries wrote: > 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. > Alternatively, we could use "set auto-solib-add off". Thanks, - Tom > 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 >