From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 41123385B23D for ; Mon, 11 Apr 2022 20:14:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 41123385B23D Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-LrJEOGUuMX2vARf2zk5LUw-1; Mon, 11 Apr 2022 16:14:02 -0400 X-MC-Unique: LrJEOGUuMX2vARf2zk5LUw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6EBBE29AA381 for ; Mon, 11 Apr 2022 20:14:02 +0000 (UTC) Received: from blarsen.com (ovpn-116-38.gru2.redhat.com [10.97.116.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBC7D40CFD0F; Mon, 11 Apr 2022 20:14:00 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Subject: [PATCH v2 01/11] gdb/testsuite: introduce gdb_step_until_regexp Date: Mon, 11 Apr 2022 17:13:23 -0300 Message-Id: <20220411201333.81453-2-blarsen@redhat.com> In-Reply-To: <20220411201333.81453-1-blarsen@redhat.com> References: <20220411201333.81453-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Mon, 11 Apr 2022 20:14:05 -0000 Currently, GDB's testsuite uses a set amount of step commands to exit functions. This is a problem if a compiler emits different epilogue information from gcc, or emits no epilogue information at all. It was most noticeable if Clang was used to test GDB. To fix this unreliability, this commit introduces a new proc that will single step the inferior until it is stopped at a line that matches the given regexp, or until it steps too many times - defined as an optional argument. If the line is found, it shows up as a single PASS in the test, and if the line is not found, a single FAIL is emitted. This patch only introduces this proc, but does not add it to any existing tests, these will be introduced in the following commit. --- gdb/testsuite/lib/gdb.exp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2eb711748e7..c48c5919a61 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8506,5 +8506,35 @@ proc get_set_option_choices {set_cmd} { return $values } +# This proc is used mainly to exit function in a compiler agnostic way +# It makes gdb single step and evaluate the output at every step, to see +# if the regexp is present. +# +# The proc takes 2 optional arguments, the first being the name of the +# test and the second the maximum amount of iterations until we expect to +# see the function. The default is 10 steps, since this is meant as the +# last step by default, and we don't expect any compiler generated epilogue +# longer than 10 steps. + +proc gdb_step_until_regexp { regexp {test_name "single stepping until regexp"} {max_steps 10} } { + global gdb_prompt + + set count 0 + gdb_test_multiple "step" "$test_name" { + -re "$regexp\r\n$gdb_prompt $" { + pass $test_name + } + -re ".*$gdb_prompt $" { + if {$count < $max_steps} { + incr count + send_gdb "step\n" + exp_continue + } else { + fail $test_name + } + } + } +} + # Always load compatibility stuff. load_lib future.exp -- 2.31.1