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.133.124]) by sourceware.org (Postfix) with ESMTPS id D8D7F3858D28 for ; Wed, 20 Jul 2022 19:44:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8D7F3858D28 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-426-TWz2MchzOcCwikPkJ7G0XQ-1; Wed, 20 Jul 2022 15:44:55 -0400 X-MC-Unique: TWz2MchzOcCwikPkJ7G0XQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70C018037AC for ; Wed, 20 Jul 2022 19:44:55 +0000 (UTC) Received: from blarsen.com (ovpn-116-8.gru2.redhat.com [10.97.116.8]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F07D403D0C1; Wed, 20 Jul 2022 19:44:54 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Subject: [PATCH v4 01/15] gdb/testsuite: introduce gdb_step_until Date: Wed, 20 Jul 2022 16:44:26 -0300 Message-Id: <20220720194441.168906-2-blarsen@redhat.com> In-Reply-To: <20220720194441.168906-1-blarsen@redhat.com> References: <20220720194441.168906-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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.4 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_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Wed, 20 Jul 2022 19:44:59 -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 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 698dd14504e..aae5cb31255 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8832,5 +8832,35 @@ gdb_caching_proc arm_cc_for_target { return "" } +# Step until the pattern REGEXP is found. Step at most +# MAX_STEPS times, but stop stepping once REGEXP is found. +# +# If REGEXP is found then a single pass is emitted, otherwise, after +# MAX_STEPS steps, a single fail is emitted. +# +# TEST_NAME is the name used in the pass/fail calls. + +proc gdb_step_until { regexp {test_name ""} {max_steps 10} } { + if { $test_name == "" } { + set test_name "stepping until regexp" + } + + 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