From patchwork Wed Jan 25 22:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63723 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 7E56D3881D01 for ; Wed, 25 Jan 2023 22:50:23 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from qproxy3-pub.mail.unifiedlayer.com (qproxy3-pub.mail.unifiedlayer.com [67.222.38.20]) by sourceware.org (Postfix) with ESMTPS id A2263383FB80 for ; Wed, 25 Jan 2023 22:47:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2263383FB80 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by qproxy3.mail.unifiedlayer.com (Postfix) with ESMTP id ECA5D8028A22 for ; Wed, 25 Jan 2023 22:47:33 +0000 (UTC) Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id DE0C9100411CC for ; Wed, 25 Jan 2023 22:46:33 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KoXJpMxttGjYaKoXJpt0NI; Wed, 25 Jan 2023 22:46:33 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=cdgXElPM c=1 sm=1 tr=0 ts=63d1b149 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=lYigRcPjP-9PvG_gBo8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=SwFxOJ3n+6qiE11FmQxVb5rcFu/QuKO0fOHr6RaDUHg=; b=JjwArW6egStR5gRgjkYvWbzEwS R4dpjfjwvQ6d3JRjavVcLMIJhA6KHxJcXQYflS+NyBL9vynkk8c3e5U6kLX7i4KSiMr79+EMcLbtg zdA96GbPJ0eEpciYkvVz//Vyf; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:53060 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pKoXJ-000gfc-H9; Wed, 25 Jan 2023 15:46:33 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 12/27] Use clean_restart in gdb.trace Date: Wed, 25 Jan 2023 15:45:59 -0700 Message-Id: <20230125224614.1006886-13-tom@tromey.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pKoXJ-000gfc-H9 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:53060 X-Source-Auth: tom+tromey.com X-Email-Count: 22 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change gdb.trace to use clean_restart more consistently. --- gdb/testsuite/gdb.trace/actions.exp | 20 +++-------------- gdb/testsuite/gdb.trace/ax.exp | 6 +----- gdb/testsuite/gdb.trace/change-loc.exp | 4 +--- gdb/testsuite/gdb.trace/deltrace.exp | 10 +-------- gdb/testsuite/gdb.trace/entry-values.exp | 11 +--------- gdb/testsuite/gdb.trace/infotrace.exp | 9 +------- gdb/testsuite/gdb.trace/packetlen.exp | 8 ++----- gdb/testsuite/gdb.trace/passc-dyn.exp | 7 ++---- gdb/testsuite/gdb.trace/passcount.exp | 9 +------- gdb/testsuite/gdb.trace/pending.exp | 4 +--- gdb/testsuite/gdb.trace/read-memory.exp | 5 +---- gdb/testsuite/gdb.trace/report.exp | 7 +----- gdb/testsuite/gdb.trace/save-trace.exp | 9 +------- gdb/testsuite/gdb.trace/tfile.exp | 5 +---- gdb/testsuite/gdb.trace/tfind.exp | 8 ++----- gdb/testsuite/gdb.trace/tracecmd.exp | 9 +------- gdb/testsuite/gdb.trace/tsv.exp | 6 ++---- gdb/testsuite/gdb.trace/unavailable.exp | 25 +++++----------------- gdb/testsuite/gdb.trace/while-dyn.exp | 8 ++----- gdb/testsuite/gdb.trace/while-stepping.exp | 20 +++-------------- 20 files changed, 33 insertions(+), 157 deletions(-) diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp index cf7efbbd4fd..270dd3f5aa4 100644 --- a/gdb/testsuite/gdb.trace/actions.exp +++ b/gdb/testsuite/gdb.trace/actions.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -28,12 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) @@ -325,10 +317,7 @@ gdb_test "tsave -ctf ${tracefile}.ctf" \ "save ctf trace file" # Restart GDB and read the trace data in tfile target. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_file_cmd $binfile +clean_restart $binfile gdb_test "target tfile ${tracefile}.tf" ".*" \ "change to tfile target" check_tracepoint "tfile" @@ -345,10 +334,7 @@ gdb_test_multiple "target ctf" "" { } if { $gdb_can_read_ctf_data } { - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ctf ${tracefile}.ctf" ".*" \ "change to ctf target" check_tracepoint "ctf" diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp index 9dee743c8dd..9cc61d09182 100644 --- a/gdb/testsuite/gdb.trace/ax.exp +++ b/gdb/testsuite/gdb.trace/ax.exp @@ -20,9 +20,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start standard_testfile actions.c require gdb_trace_common_supports_arch @@ -33,9 +30,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } -gdb_load $binfile +clean_restart $binfile runto_main -gdb_reinitialize_dir $srcdir/$subdir gdb_test "maint agent 12" ".*const8 12.*pop.*end.*" diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 4c4f54d89be..b77e283c0b4 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -175,9 +175,7 @@ proc tracepoint_change_loc_2 { trace_type } { global binfile global gdb_prompt - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir + clean_restart gdb_test_multiple "${trace_type} set_tracepoint" "set pending tracepoint" { -re ".*Make \(|fast \)tracepoint pending.*y or \\\[n\\\]. $" { diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp index cfcb81e8c91..c3107853808 100644 --- a/gdb/testsuite/gdb.trace/deltrace.exp +++ b/gdb/testsuite/gdb.trace/deltrace.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch @@ -30,12 +26,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index d7e5a89f281..9fbad50e3bd 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -29,14 +29,7 @@ if {[gdb_compile [list ${binfile}1.o] \ return -1 } -# Start GDB and load executable file, compute the offset of the -# instruction in bar returned from foo. It is needed in the Dwarf -# Assembler. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile}1 +clean_restart ${binfile}1 set returned_from_foo "" @@ -83,8 +76,6 @@ if { [string equal $returned_from_foo ""] } { return -1 } -gdb_exit - # Make some DWARF for the test. set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp index 1252b30c0f5..41779206679 100644 --- a/gdb/testsuite/gdb.trace/infotrace.exp +++ b/gdb/testsuite/gdb.trace/infotrace.exp @@ -18,9 +18,6 @@ load_lib "trace-support.exp" -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch @@ -30,12 +27,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # # test "info tracepoints" command diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp index 31686bcb3bb..df4badc35bd 100644 --- a/gdb/testsuite/gdb.trace/packetlen.exp +++ b/gdb/testsuite/gdb.trace/packetlen.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -28,11 +24,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_load $binfile + +clean_restart $binfile gdb_test "tstop" ".*" "" gdb_test "tfind none" ".*" "" runto_main -gdb_reinitialize_dir $srcdir/$subdir if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp index c005c79053b..26a2cac4dd9 100644 --- a/gdb/testsuite/gdb.trace/passc-dyn.exp +++ b/gdb/testsuite/gdb.trace/passc-dyn.exp @@ -17,9 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -27,9 +24,9 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_load $binfile + +clean_restart $binfile runto_main -gdb_reinitialize_dir $srcdir/$subdir if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp index 3f711496083..d26d99946ed 100644 --- a/gdb/testsuite/gdb.trace/passcount.exp +++ b/gdb/testsuite/gdb.trace/passcount.exp @@ -17,9 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -27,12 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp index 76d28652820..da355bcdaee 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -66,9 +66,7 @@ proc pending_tracepoint_resolved { trace_type } { global lib_sl1 # Start with a fresh gdb. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir + clean_restart gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" { -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" { diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp index 9d82939ca74..f24f72884ae 100644 --- a/gdb/testsuite/gdb.trace/read-memory.exp +++ b/gdb/testsuite/gdb.trace/read-memory.exp @@ -127,10 +127,7 @@ proc teset_from_exec { target } { global tracefile # Restart GDB and read the trace data in ${target} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target} ${tracefile}.${target}" ".*" \ "change to ${target} target" diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index 33bccaa1a6a..14db2511d40 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -28,9 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_load $binfile +clean_restart $binfile runto_main -gdb_reinitialize_dir $srcdir/$subdir if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp index 71a094a25dc..ab0dce26d13 100644 --- a/gdb/testsuite/gdb.trace/save-trace.exp +++ b/gdb/testsuite/gdb.trace/save-trace.exp @@ -18,9 +18,6 @@ load_lib "trace-support.exp" -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -28,12 +25,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index 68e951b1c83..c62f7e3e9e4 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -121,10 +121,7 @@ gdb_test "info registers" "The program has no registers now\." \ # Now start afresh, using only a trace file. -gdb_exit -gdb_start - -gdb_load $binfile +clean_restart $binfile gdb_test "target tfile $tfile_error" "Created tracepoint.*" \ "target tfile [file tail $tfile_error]" diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp index 4579e85ed86..2dbc42bb631 100644 --- a/gdb/testsuite/gdb.trace/tfind.exp +++ b/gdb/testsuite/gdb.trace/tfind.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch @@ -30,7 +26,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \ untested "failed to compile" return -1 } -gdb_load $binfile + +clean_restart $binfile # 6.2 test help tstart gdb_test "help tstart" \ @@ -60,7 +57,6 @@ gdb_test "help tfind trace" "Select a trace frame by tracepoint number.*" \ "8.38: help tfind tracepoint" runto_main -gdb_reinitialize_dir $srcdir/$subdir if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp index 7ce6f59e2c9..0cf1ce0e0c0 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -17,9 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -27,12 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # define relative source line numbers: # all subsequent line numbers are relative to this first one (baseline) diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp index ea7ad55143a..2319444fab1 100644 --- a/gdb/testsuite/gdb.trace/tsv.exp +++ b/gdb/testsuite/gdb.trace/tsv.exp @@ -15,9 +15,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ @@ -25,7 +22,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_load $binfile + +clean_restart $binfile # PR gdb/21352: Command tsave does not support -r argument gdb_test "tsave -r" "Argument required \\\(file in which to save trace data\\\)\." \ diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index 65fc56c3383..ef091cbb0f4 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -202,10 +202,7 @@ proc gdb_collect_args_test {} { foreach target_name ${trace_file_targets} { # Restart GDB and read the trace data in ${TARGET_NAME} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target_name} ${tracefile}.args.${target_name}" ".*" \ "change to ${target_name} target" @@ -286,10 +283,7 @@ proc gdb_collect_locals_test { func msg } { foreach target_name ${trace_file_targets} { # Restart GDB and read the trace data in ${TARGET_NAME} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target_name} ${tracefile}.locals.${target_name}" ".*" \ "change to ${target_name} target" @@ -369,10 +363,7 @@ proc gdb_unavailable_registers_test { } { foreach target_name ${trace_file_targets} { # Restart GDB and read the trace data in ${TARGET_NAME} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target_name} ${tracefile}.registers.${target_name}" ".*" \ "change to ${target_name} target" @@ -433,10 +424,7 @@ proc gdb_unavailable_floats { } { foreach target_name ${trace_file_targets} { # Restart GDB and read the trace data in ${TARGET_NAME} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target_name} ${tracefile}.floats.${target_name}" ".*" \ "change to ${target_name} target" @@ -701,10 +689,7 @@ proc gdb_collect_globals_test { } { foreach target_name ${trace_file_targets} { # Restart GDB and read the trace data in ${TARGET_NAME} target. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ${target_name} ${tracefile}.globals.${target_name}" ".*" \ "change to ${target_name} target" diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp index 960a95926b7..797020e7674 100644 --- a/gdb/testsuite/gdb.trace/while-dyn.exp +++ b/gdb/testsuite/gdb.trace/while-dyn.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c set executable $testfile require gdb_trace_common_supports_arch @@ -29,9 +25,9 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ untested "failed to compile" return -1 } -gdb_load $binfile + +clean_restart $binfile runto_main -gdb_reinitialize_dir $srcdir/$subdir if {![gdb_target_supports_trace]} { unsupported "current target does not support trace" diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp index 64c0c9ed84f..ba4ad4434d5 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -17,10 +17,6 @@ load_lib "trace-support.exp" - -gdb_exit -gdb_start - standard_testfile actions.c require gdb_trace_common_supports_arch if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \ @@ -28,12 +24,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \ untested "failed to compile" return -1 } -gdb_reinitialize_dir $srcdir/$subdir - -# If testing on a remote host, download the source file. -# remote_download host $srcdir/$subdir/$srcfile -gdb_file_cmd $binfile +clean_restart $binfile # # test while-stepping command @@ -151,10 +143,7 @@ gdb_test "tsave -ctf ${tracefile}.ctf" \ "save ctf trace file" # Restart GDB and read the trace data in tfile target. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_file_cmd $binfile +clean_restart $binfile gdb_test "target tfile ${tracefile}.tf" ".*" \ "change to tfile target" check_tracepoint "tfile" @@ -171,10 +160,7 @@ gdb_test_multiple "target ctf" "" { } if { $gdb_can_read_ctf_data } { - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_file_cmd $binfile + clean_restart $binfile gdb_test "target ctf ${tracefile}.ctf" ".*" \ "change to ctf target" check_tracepoint "ctf"