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 97BEB3840C09 for ; Tue, 2 Jun 2020 12:26:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 97BEB3840C09 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 D71DFACCE; Tue, 2 Jun 2020 12:26:08 +0000 (UTC) Subject: [committed][gdb/testsuite] Fix scrolling in gdb.dwarf2/multidictionary.exp To: Tom Tromey , Keith Seitz Cc: gdb-patches@sourceware.org References: <20181109022847.32049-1-keiths@redhat.com> <20181109022847.32049-5-keiths@redhat.com> <87sgzil1s9.fsf@tromey.com> From: Tom de Vries 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: Date: Tue, 2 Jun 2020 14:26:04 +0200 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: <87sgzil1s9.fsf@tromey.com> Content-Type: multipart/mixed; boundary="------------6F090DC626E717B4B647A600" Content-Language: en-US X-Spam-Status: No, score=-16.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP 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: Tue, 02 Jun 2020 12:26:09 -0000 This is a multi-part message in MIME format. --------------6F090DC626E717B4B647A600 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit [ was: Re: [PATCH 5/5] gdb/23712: Test case for multidictionary ] On 30-11-2018 21:59, Tom Tromey wrote: >>>>>> "Keith" == Keith Seitz writes: > > Keith> This is a test derived from one of the reproducers in symtab/23010. > Keith> The DIE tree used here is typical of compilations with LTO, where an > Keith> artificial parent DIE of language C99 imports DIEs of other languages. > > Keith> testsuite/ChangeLog: > > Keith> PR gdb/23712 > Keith> * gdb.dwarf2/multidictionary.exp: New file. > > Thanks. This is great. > > Keith> +# We force the DIEs above to be read in via "--readnow". > Keith> +set saved_gdbflags $GDBFLAGS > Keith> +append GDBFLAGS " --readnow" > Keith> + > Keith> +if {[prepare_for_testing "failed to prepare" $testfile \ > Keith> + "${asm_file} ${srcfile}" {}]} { > Keith> + return -1 > Keith> +} > Keith> +set GDBFLAGS $saved_gdbflags > > I recently learned about gdb_spawn_with_cmdline_opts -- see > gdb.base/warning.exp for an example. I think that's preferable to > saving and resetting GDBFLAGS. > I ran into another problem in this test-case due to using gdb_spawn_with_cmdline_opts. I've fixed this by removing the use of gdb_spawn_with_cmdline_opts, and temporarily modifying GDBFLAGS instead (using save_vars to restore the value). Thanks, - Tom --------------6F090DC626E717B4B647A600 Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Fix-scrolling-in-gdb.dwarf2-multidictionary.exp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Fix-scrolling-in-gdb.dwarf2-multidictiona"; filename*1="ry.exp.patch" [gdb/testsuite] Fix scrolling in gdb.dwarf2/multidictionary.exp Consider a gdb_load patch to call the gdb_file_cmd twice: ... proc gdb_load { arg } { if { $arg != "" } { + set res [gdb_file_cmd $arg] + if { $res != 0 } { + return $res + } return [gdb_file_cmd $arg] } return 0 } ... With this patch, I run into: ... (gdb) kill^M The program is not being run.^M (gdb) ^M * gdb.dwarf2/multidictionary.exp: Don't use gdb_spawn_with_cmdline_opts. --- gdb/testsuite/gdb.dwarf2/multidictionary.exp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/multidictionary.exp b/gdb/testsuite/gdb.dwarf2/multidictionary.exp index 01e5a0de45..45ba1ed99b 100644 --- a/gdb/testsuite/gdb.dwarf2/multidictionary.exp +++ b/gdb/testsuite/gdb.dwarf2/multidictionary.exp @@ -147,12 +147,9 @@ if {[build_executable $testfile.exp $testfile [list $asm_file $srcfile] {}] \ } # We force the DIEs above to be read in via "-readnow". -gdb_spawn_with_cmdline_opts "-readnow" -set test "initial prompt" -gdb_test_multiple "" $test { - -re ".*$gdb_prompt $" { - pass "$test" - } +save_vars { GDBFLAGS } { + set GDBFLAGS "$GDBFLAGS -readnow" + clean_restart } gdb_load $binfile --------------6F090DC626E717B4B647A600--