From patchwork Mon Nov 21 17:12:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 60932 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 85002385220C for ; Mon, 21 Nov 2022 17:13:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 85002385220C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669050784; bh=fPBtU427BuL2MWJbM6RuUoEK207k67b0ZcUrQkbOhtg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=TDCchIYfPivZFwSYSLlVXyV5f1k5fqREQIgEOfTu6FoUoXH+rtmEWkKMXHFXxrplp ulZi16RuN0lrAnyzQxdHGOtr2Z6gJ91BzaZ8A1d00LZLeRWXyCOdunY/nKRBKLq1oJ rH+QvLkmyi9G8WFik4XEpqzXwHxiNhrMyTZCHR4I= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 305B6385457A for ; Mon, 21 Nov 2022 17:12:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 305B6385457A Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2ALHCFl8009723 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Nov 2022 12:12:20 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2ALHCFl8009723 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 7E1BD1E11F; Mon, 21 Nov 2022 12:12:15 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 1/5] gdb/testsuite: remove global declarations in gdb.threads/detach-step-over.exp Date: Mon, 21 Nov 2022 12:12:09 -0500 Message-Id: <20221121171213.1414366-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221121171213.1414366-1-simon.marchi@polymtl.ca> References: <20221121171213.1414366-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Mon, 21 Nov 2022 17:12:15 +0000 X-Spam-Status: No, score=-3189.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, 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-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" From: Simon Marchi Before doing further changes to this file, change to use the :: notation instead of declaring global variables with the `global` keyword. Change-Id: I72301fd8f4693fea61aac054ba17245a1f4442fb --- .../gdb.threads/detach-step-over.exp | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite/gdb.threads/detach-step-over.exp index 15af7e0e7231..917be2ef3782 100644 --- a/gdb/testsuite/gdb.threads/detach-step-over.exp +++ b/gdb/testsuite/gdb.threads/detach-step-over.exp @@ -58,24 +58,18 @@ set bp_lineno [gdb_get_line_number "Set breakpoint here"] # The test proper. See description above. proc test {condition_eval target_non_stop non_stop displaced} { - global binfile srcfile - global gdb_prompt - global decimal - global bp_lineno - global GDBFLAGS - # Number of threads started by the program. set n_threads 10 - save_vars { GDBFLAGS } { - append GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\"" - append GDBFLAGS " -ex \"set non-stop $non_stop\"" - append GDBFLAGS " -ex \"set displaced $displaced\"" - append GDBFLAGS " -ex \"set schedule-multiple on\"" - clean_restart $binfile + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\"" + append ::GDBFLAGS " -ex \"set non-stop $non_stop\"" + append ::GDBFLAGS " -ex \"set displaced $displaced\"" + append ::GDBFLAGS " -ex \"set schedule-multiple on\"" + clean_restart $::binfile } - set test_spawn_id [spawn_wait_for_attach $binfile] + set test_spawn_id [spawn_wait_for_attach $::binfile] set testpid [spawn_id_get_pid $test_spawn_id] set any "\[^\r\n\]*" @@ -83,7 +77,7 @@ proc test {condition_eval target_non_stop non_stop displaced} { gdb_test "add-inferior" "Added inferior 2.*" gdb_test "inferior 2" "Switching to .*" - gdb_load $binfile + gdb_load $::binfile if ![runto setup_done] then { fail "can't run to setup_done" kill_wait_spawned_process $test_spawn_id @@ -95,7 +89,7 @@ proc test {condition_eval target_non_stop non_stop displaced} { # Get the PID of the test process. set pid_inf2 "" gdb_test_multiple "p mypid" "get pid of inferior 2" { - -re " = ($decimal)\r\n$gdb_prompt $" { + -re " = ($::decimal)\r\n$::gdb_prompt $" { set pid_inf2 $expect_out(1,string) pass $gdb_test_name } @@ -124,13 +118,13 @@ proc test {condition_eval target_non_stop non_stop displaced} { # Prevent -readnow timeout. exp_continue } - -re "is a zombie - the process has already terminated.*$gdb_prompt " { + -re "is a zombie - the process has already terminated.*$::gdb_prompt " { fail $gdb_test_name } - -re "Unable to attach: .*$gdb_prompt " { + -re "Unable to attach: .*$::gdb_prompt " { fail $gdb_test_name } - -re "\r\n$gdb_prompt " { + -re "\r\n$::gdb_prompt " { if { $saw_attaching } { set attached 1 pass $test @@ -173,7 +167,7 @@ proc test {condition_eval target_non_stop non_stop displaced} { } # Set threads stepping over a breakpoint continuously. - gdb_test "break $srcfile:$bp_lineno if 0" "Breakpoint.*" \ + gdb_test "break $::srcfile:$::bp_lineno if 0" "Breakpoint.*" \ "break LOC if 0" if {$attempt < $attempts} { @@ -192,7 +186,7 @@ proc test {condition_eval target_non_stop non_stop displaced} { set cont_cmd_re [string_to_regexp $cont_cmd] gdb_test_multiple $cont_cmd "" { - -re "^$cont_cmd_re\r\nContinuing\.\r\n$gdb_prompt " { + -re "^$cont_cmd_re\r\nContinuing\.\r\n$::gdb_prompt " { pass $gdb_test_name } } @@ -208,14 +202,14 @@ proc test {condition_eval target_non_stop non_stop displaced} { incr running_count exp_continue } - -re "Cannot execute this command while the target is running.*$gdb_prompt $" { + -re "Cannot execute this command while the target is running.*$::gdb_prompt $" { # Testing against a remote server that doesn't do # non-stop mode. Explicitly interrupt. This # doesn't test the same code paths in GDB, but # it's still something. set interrupted 1 gdb_test_multiple "interrupt" "" { - -re "$gdb_prompt " { + -re "$::gdb_prompt " { gdb_test_multiple "" $gdb_test_name { -re "received signal SIGINT, Interrupt" { pass $gdb_test_name @@ -224,7 +218,7 @@ proc test {condition_eval target_non_stop non_stop displaced} { } } } - -re "$gdb_prompt $" { + -re "$::gdb_prompt $" { gdb_assert {$running_count == ($n_threads + 1) * 2} $gdb_test_name } }