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 0BF163870869 for ; Fri, 12 Jun 2020 07:47:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0BF163870869 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 392B7AC9F; Fri, 12 Jun 2020 07:47:09 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Don't abort testrun for invalid command in test-case To: Pedro Alves , gdb-patches@sourceware.org References: <20200611143522.GA19667@delia> <7d7ce523-b58c-a77d-15be-8091feb6389a@redhat.com> <18e36963-4f04-f871-33fb-89a5d1683bbd@suse.de> 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: Fri, 12 Jun 2020 09:47:01 +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: Content-Type: multipart/mixed; boundary="------------1013786D16860343389BDF2A" Content-Language: en-US X-Spam-Status: No, score=-16.0 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: Fri, 12 Jun 2020 07:47:08 -0000 This is a multi-part message in MIME format. --------------1013786D16860343389BDF2A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 11-06-2020 18:56, Pedro Alves wrote: > On 6/11/20 5:25 PM, Tom de Vries wrote: >> On 11-06-2020 17:31, Pedro Alves wrote: > >>> I'd think it would be cleaner to override unknown in gdb_init, >>> and restore in gdb_finish. No need for filename matching that way. >>> Like below. Any reason you didn't go for this instead? >>> >> I don't think it's cleaner, because we run default_gdb_init, as well the >> bit of proc runtest between ${tool}_init a ${tool}_finish with the >> altered ::unknown. > > Well, that is code that is exercised by all testscases, it's part of the > framework. It's not going to ever contain calls to procedures that > don't exist that go unnoticed for long. The whole testsuite would > collapse. We can move the overriding until after default_gdb_init > is called, even, so that even less code runs under gdb's "unknown": > > set res [default_gdb_init $test_file_name] > > # Skip dejagnu_unknown while running a testcase to prevent it from > # exiting and aborting the entire test run. Save the unknown proc > # defined by DejaGnu, and override the unknown proc with a > # gdb-local version. > rename ::unknown ::dejagnu_unknown > proc unknown { args } { > return [uplevel 1 ::tcl_unknown $args] > } > > return $res > } > >> Alternatively, we could override source to detect the precise point that >> runtest hands control to the test-case, as attached. But there's still >> filename matching. [ Note btw, that this approach changes the scope of >> the fix slightly. ] > > Overriding standard procs and filename matching strikes me as uglier than > using the hooks that dejagnu provides (init/finish), but I can also see your > point of only overriding unknown for the exact duration of the sourced file > being cleaner. Thus, I'm not objecting and leave it up to you. I agree > that it's nice that we don't abort the whole testsuite. > I'm convinced now, it's best to use dejagnu hooks (although my questions related to gdb_init/default_gdb_init remain). > BTW, isn't "tcl_unknown" an internal DejaGnu name? We should document > that in a comment, since this could break if DejaGnu changes the renamed > proc's name. Done. Committed as attached. Thanks, - Tom > Another reason to ask DejaGnu to handle this for us cleanly. > --------------1013786D16860343389BDF2A Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Don-t-abort-testrun-for-invalid-command-in-test-case.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-gdb-testsuite-Don-t-abort-testrun-for-invalid-command-i"; filename*1="n-test-case.patch" [gdb/testsuite] Don't abort testrun for invalid command in test-case Say we add a call to foobar at the end of a test-case, and run the test-suite. We'll run into a dejagnu error: ... ERROR: (DejaGnu) proc "foobar" does not exist. ... and the test-suite run is aborted. It's reasonable that the test-case is aborted, but it's not reasonable that the testsuite run is aborted. Problems in one test-case should not leak into other test-cases, and they generally don't. The exception is the "invalid command name" problem due to an override of ::unknown in dejagnu's framework.exp. Fix this by reverting dejagnu's ::unknown override for the duration of each test-case, using the gdb_init/gdb_finish hooks. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-06-11 Tom de Vries PR testsuite/26110 * lib/gdb.exp (gdb_init): Revert dejagnu's override of ::unknown. (gdb_finish): Reinstall dejagnu's override of ::unknown. --- gdb/testsuite/lib/gdb.exp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 51f8a05464..64e667c20e 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5193,7 +5193,19 @@ proc gdb_init { test_file_name } { global gdb_instances set gdb_instances 0 - return [default_gdb_init $test_file_name] + set res [default_gdb_init $test_file_name] + + # Dejagnu overrides proc unknown. The dejagnu version may trigger in a + # test-case but abort the entire test run. To fix this, we install a + # local version here, which reverts dejagnu's override, and restore + # dejagnu's version in gdb_finish. + rename ::unknown ::dejagnu_unknown + proc unknown { args } { + # Dejagnu saves the original version in ::tcl_unknown, use it. + return [uplevel 1 ::tcl_unknown $args] + } + + return $res } proc gdb_finish { } { @@ -5201,6 +5213,10 @@ proc gdb_finish { } { global gdb_prompt global cleanfiles + # Restore dejagnu's version of proc unknown. + rename ::unknown "" + rename ::dejagnu_unknown ::unknown + # Exit first, so that the files are no longer in use. gdb_exit --------------1013786D16860343389BDF2A--