From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id D93063858C50; Mon, 27 Mar 2023 11:58:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D93063858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679918321; bh=UtCUbjKGWcN6rma2+Cr5MnWDEcpS5mdhSVFjzQ6WjZ8=; h=From:To:Subject:Date:From; b=ojYbnhGpqN48dFmeqX0Enm8SpatRPW+UD93BBGwbQZx74lxGIYjM0NLlgcBDPB0ZW SqwP6v8JfFQTSicnrf5/v59zX2mJOfqBoaM5/3E7A9WuHPobblL8ZJDJAIz6tAT1Pl fsNtoXNM6bcoewLOaShFqV39oQq7rDT1c3b879WU= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.dwarf2/gdb-index.exp on remote host X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 8eef5130eeef49f489d9cd61c6c9695fc006ab39 X-Git-Newrev: a653ec1f361bf70370b63a91355864d3757229aa Message-Id: <20230327115841.D93063858C50@sourceware.org> Date: Mon, 27 Mar 2023 11:58:41 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da653ec1f361b= f70370b63a91355864d3757229aa commit a653ec1f361bf70370b63a91355864d3757229aa Author: Tom de Vries Date: Mon Mar 27 13:58:10 2023 +0200 [gdb/testsuite] Fix gdb.dwarf2/gdb-index.exp on remote host =20 Fix test-case gdb.dwarf2/gdb-index.exp on remote host using gdb_remote_download and host_standard_output_file. =20 Also declare the test-case unsupported with readnow. =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.dwarf2/gdb-index.exp | 36 ++++++++++++++++++++++++------= ---- gdb/testsuite/lib/gdb.exp | 7 ++++++- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwa= rf2/gdb-index.exp index 8a12e35f353..c28f45c5e5c 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp @@ -18,6 +18,9 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2. require dwarf2_support =20 +# Can't save an index with readnow. +require !readnow + standard_testfile main.c =20 if { [prepare_for_testing "failed to prepare" "${testfile}" \ @@ -32,16 +35,17 @@ if { [prepare_for_testing "failed to prepare" "${testfi= le}" \ # Use local prefix to prevent overriding add_gdb_index from lib/gdb.exp. =20 proc local_add_gdb_index { program } { - set index_file ${program}.gdb-index - set dir [file dirname ${program}] set filename [file tail ${program}] - set dwz $dir/.tmp/${filename}.dwz - set dwz_index_file $program.dwz.gdb-index + set host_program [gdb_remote_download host $program] + set index_file [host_standard_output_file $filename.gdb-index] + set tmpdir [host_standard_output_file .tmp] + set dwz $tmpdir/$filename.dwz + set dwz_index_file [host_standard_output_file $filename.dwz.gdb-index] verbose -log "index_file: ${index_file}" remote_file host delete ${index_file} remote_file host delete ${dwz_index_file} gdb_test_no_output "save gdb-index [file dirname ${index_file}]" \ - "save gdb-index for file [file tail ${program}]" + "save gdb-index for file $filename" =20 # No point in continuing if generating the index failed. # N.B.: There are times when gdb won't create an index, and it's not a @@ -55,8 +59,16 @@ proc local_add_gdb_index { program } { return "" } =20 - set program_with_index ${program}.with-index - if {[run_on_host "objcopy" [gdb_find_objcopy] "--remove-section .gdb_i= ndex --add-section .gdb_index=3D$index_file --set-section-flags .gdb_index= =3Dreadonly ${program} ${program_with_index}"]} { + set host_program_with_index $host_program.with-index + set program_with_index $program.with-index + if {[run_on_host "objcopy" [gdb_find_objcopy] \ + [join \ + [list \ + "--remove-section .gdb_index" \ + "--add-section .gdb_index=3D$index_file" \ + "--set-section-flags .gdb_index=3Dreadonly" \ + "$host_program" \ + "$host_program_with_index"]]]} { return "" } =20 @@ -73,7 +85,9 @@ proc local_add_gdb_index { program } { } } =20 - return ${program_with_index} + return [list \ + [remote_upload host $host_program_with_index $program_with_index] \ + $host_program_with_index] } =20 # Build a copy of the program with an index (.gdb_index/.debug_names). @@ -84,12 +98,14 @@ set test "check if index present" gdb_test_multiple "mt print objfiles ${testfile}" $test { -re "gdb_index.*${gdb_prompt} $" { set binfile_with_index $binfile + set host_binfile_with_index [gdb_remote_download host $binfile] } -re "debug_names.*${gdb_prompt} $" { set binfile_with_index $binfile + set host_binfile_with_index [gdb_remote_download host $binfile] } -re "(Psymtabs|Cooked).*${gdb_prompt} $" { - set binfile_with_index [local_add_gdb_index $binfile] + lassign [local_add_gdb_index $binfile] binfile_with_index host_binfile_wi= th_index if { ${binfile_with_index} =3D=3D "" } { return -1 } @@ -114,7 +130,7 @@ gdb_test "mt print objfiles ${testfile}" \ # Is touch portable enough? # First make sure enough time has passed, file mtime resolution is seconds. gdb_test_no_output "shell sleep 1" -if {[run_on_host "touch binary" touch ${binfile_with_index}]} { +if {[run_on_host "touch binary" touch $host_binfile_with_index]} { return -1 } =20 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2cf128fdd68..39ed5ad761b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -6412,7 +6412,12 @@ proc standard_output_file {basename} { =20 proc host_standard_output_file { basename } { if { [is_remote host] } { - return $basename + set remotedir [board_info host remotedir] + if { $remotedir =3D=3D "" } { + return $basename + } else { + return [join [list $remotedir $basename] "/"] + } } else { return [standard_output_file $basename] }