From patchwork Fri Aug 15 03:59:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2400 Received: (qmail 7655 invoked by alias); 15 Aug 2014 04:04:09 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 7533 invoked by uid 89); 15 Aug 2014 04:04:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 15 Aug 2014 04:04:04 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1XI8kC-0005XE-L1 from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Thu, 14 Aug 2014 21:04:00 -0700 Received: from SVR-ORW-FEM-06.mgc.mentorg.com ([147.34.97.120]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 14 Aug 2014 21:04:00 -0700 Received: from qiyao.dyndns.org.com (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.2.247.3; Thu, 14 Aug 2014 21:03:59 -0700 From: Yao Qi To: Subject: [PATCH 2/3] Keep track of downloaded file in gdb_remote_download Date: Fri, 15 Aug 2014 11:59:43 +0800 Message-ID: <1408075184-25947-3-git-send-email-yao@codesourcery.com> In-Reply-To: <1408075184-25947-1-git-send-email-yao@codesourcery.com> References: <1408075184-25947-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes This patch is to teach gdb_remote_download to keep track of downloaded files, so that they can be deleted on gdb_finish, so we don't have to manually delete downloaded files in each test. gdb/testsuite: 2014-08-14 Yao Qi * lib/gdb.exp (gdb_remote_download): Record $destname in cleanfiles. * gdb.base/checkpoint.exp: Don't explicitly remove file copied on host. * gdb.base/step-line.exp: Likewise. * gdb.dwarf2/dw2-anonymous-func.exp: Likewise. * gdb.dwarf2/dw2-basic.exp: Likewise. * gdb.dwarf2/dw2-compressed.exp: Likewise. * gdb.dwarf2/dw2-filename.exp: Likewise. * gdb.dwarf2/dw2-intercu.exp: Likewise. * gdb.dwarf2/dw2-intermix.exp: Likewise. * gdb.dwarf2/dw2-producer.exp: Likewise. * gdb.dwarf2/mac-fileno.exp: Likewise. * gdb.python/py-frame-args.exp: Likewise. * gdb.python/py-mi.exp: Likewise. * gdb.python/py-pp-integral.exp: Likewise. * gdb.python/py-pp-re-notag.exp: Likewise. * gdb.python/py-prettyprint.exp: Likewise. * gdb.python/py-section-script.exp: Likewise. * gdb.python/py-typeprint.exp: Likewise. * gdb.python/py-xmethods.exp: Likewise. * gdb.stabs/weird.exp: Likewise. * gdb.xml/tdesc-regs.exp: Likewise. --- gdb/testsuite/gdb.base/checkpoint.exp | 2 -- gdb/testsuite/gdb.base/step-line.exp | 2 -- gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp | 5 +---- gdb/testsuite/gdb.dwarf2/dw2-basic.exp | 5 +---- gdb/testsuite/gdb.dwarf2/dw2-compressed.exp | 5 +---- gdb/testsuite/gdb.dwarf2/dw2-filename.exp | 5 +---- gdb/testsuite/gdb.dwarf2/dw2-intercu.exp | 2 -- gdb/testsuite/gdb.dwarf2/dw2-intermix.exp | 6 ++---- gdb/testsuite/gdb.dwarf2/dw2-producer.exp | 5 +---- gdb/testsuite/gdb.dwarf2/mac-fileno.exp | 5 +---- gdb/testsuite/gdb.python/py-frame-args.exp | 2 -- gdb/testsuite/gdb.python/py-mi.exp | 2 -- gdb/testsuite/gdb.python/py-pp-integral.exp | 2 -- gdb/testsuite/gdb.python/py-pp-re-notag.exp | 2 -- gdb/testsuite/gdb.python/py-prettyprint.exp | 4 ---- gdb/testsuite/gdb.python/py-section-script.exp | 2 -- gdb/testsuite/gdb.python/py-typeprint.exp | 2 -- gdb/testsuite/gdb.python/py-xmethods.exp | 2 -- gdb/testsuite/gdb.stabs/weird.exp | 2 -- gdb/testsuite/gdb.xml/tdesc-regs.exp | 4 ---- gdb/testsuite/lib/gdb.exp | 10 ++++++++-- 21 files changed, 16 insertions(+), 60 deletions(-) diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index b5ed1d3..2de2439 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -371,5 +371,3 @@ verbose "Timeout now $timeout sec." # # Finished: cleanup # - -remote_exec host "rm -f $pi_txt" diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index 94799f8..7f51565 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -82,6 +82,4 @@ gdb_test "next" \ ".*RETURN \\(j\\);.*" \ "next over dummy 10" -remote_file host delete ${remote_linefile} - return 0 diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp index 029104b..817c988 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp @@ -29,11 +29,8 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} # Force the debugger to create the file1.txt symtab, to make sure that # the debugger does not crash doing so. gdb_test "list file1.txt:1" "File 1 Line 1.*File 1 Line 8" "list file1.txt" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index 7823eaa..c5d5b0a 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -29,11 +29,8 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp index 76009d2..7a783b7 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -31,11 +31,8 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp index c9ead979..95b4aeb 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp @@ -28,8 +28,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {nodebug return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} clean_restart ${testfile} @@ -42,5 +41,3 @@ gdb_test "interpreter-exec mi -file-list-exec-source-files" \ # And `info sources' should return the fullname incl. the directories. gdb_test "info sources" {[/\\]file1\.txt} - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index 4a23c96..ce1c15f 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -42,5 +42,3 @@ gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int2 \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index 2f95572..1d5d237 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -29,11 +29,9 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host \ + ${srcdir}/${subdir}/${dwarf_srcfile} gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp index 6846b17..6d786fe 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -27,11 +27,8 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp index e736211..7711cb3 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -30,11 +30,8 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } -set remote_dwarf_srcfile [gdb_remote_download host \ - ${srcdir}/${subdir}/${dwarf_srcfile}] +gdb_remote_download host ${srcdir}/${subdir}/${dwarf_srcfile} gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" - -remote_file host delete ${remote_dwarf_srcfile} diff --git a/gdb/testsuite/gdb.python/py-frame-args.exp b/gdb/testsuite/gdb.python/py-frame-args.exp index 4c50be8..de4d159 100644 --- a/gdb/testsuite/gdb.python/py-frame-args.exp +++ b/gdb/testsuite/gdb.python/py-frame-args.exp @@ -68,5 +68,3 @@ gdb_test_no_output "set print frame-arguments all" gdb_test "frame" \ ".*foo \\(x=42, ss={a = {m = 1}, b = {m = 2}}\\).*" \ "frame raw,all" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index 5959175..ca02bf7 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -356,5 +356,3 @@ mi_list_varobj_children fake.private { mi_gdb_test "-var-set-visualizer fake.private gdb.default_visualizer" \ "\\^done" "Install visualizer on a cplus_fake_child" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-pp-integral.exp b/gdb/testsuite/gdb.python/py-pp-integral.exp index 8149bde..ac4403d 100644 --- a/gdb/testsuite/gdb.python/py-pp-integral.exp +++ b/gdb/testsuite/gdb.python/py-pp-integral.exp @@ -35,5 +35,3 @@ gdb_test_no_output "source ${remote_python_file}" \ gdb_test "print *t" " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)" gdb_test "print /r *t" "= 1384395743" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.exp b/gdb/testsuite/gdb.python/py-pp-re-notag.exp index 8149bde..ac4403d 100644 --- a/gdb/testsuite/gdb.python/py-pp-re-notag.exp +++ b/gdb/testsuite/gdb.python/py-pp-re-notag.exp @@ -35,5 +35,3 @@ gdb_test_no_output "source ${remote_python_file}" \ gdb_test "print *t" " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)" gdb_test "print /r *t" "= 1384395743" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp index 1096389..ae866f0 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -108,8 +108,6 @@ proc run_lang_tests {exefile lang} { "print nstype on one line" gdb_continue_to_end - - remote_file host delete ${remote_python_file} } run_lang_tests "${binfile}" "c" @@ -155,5 +153,3 @@ gdb_test_no_output "python enable_lookup_function ()" gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" \ "print ss enabled #2" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-section-script.exp b/gdb/testsuite/gdb.python/py-section-script.exp index 4f465cc..5c868d7 100644 --- a/gdb/testsuite/gdb.python/py-section-script.exp +++ b/gdb/testsuite/gdb.python/py-section-script.exp @@ -72,5 +72,3 @@ gdb_test "b [gdb_get_line_number {break to inspect} ${testfile}.c ]" \ gdb_test "continue" ".*Breakpoint.*" gdb_test "print ss" " = a=<1> b=<2>" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp index 1de80bd..ee02091 100644 --- a/gdb/testsuite/gdb.python/py-typeprint.exp +++ b/gdb/testsuite/gdb.python/py-typeprint.exp @@ -51,5 +51,3 @@ gdb_test_no_output "enable type-printer string" gdb_test "whatis bs" "string" "whatis with enabled printer" gdb_test "whatis s" "templ" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp index 8824127..093b4bc 100644 --- a/gdb/testsuite/gdb.python/py-xmethods.exp +++ b/gdb/testsuite/gdb.python/py-xmethods.exp @@ -149,5 +149,3 @@ gdb_test_no_output "disable xmethod progspace E_methods;method_int" \ "disable xmethod progspace E_methods;method_int" gdb_test "info xmethod progspace E_methods;method_int" ".* \\\[disabled\\\]" \ "info xmethod xmethods E_methods;method_int" - -remote_file host delete ${xmethods_script} diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp index 5746770..b5efc68 100644 --- a/gdb/testsuite/gdb.stabs/weird.exp +++ b/gdb/testsuite/gdb.stabs/weird.exp @@ -325,6 +325,4 @@ gdb_expect 60 { do_tests -remote_file host delete ${binfile} - return 0 diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp index 0e4547c..b0b5c7d 100644 --- a/gdb/testsuite/gdb.xml/tdesc-regs.exp +++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp @@ -167,7 +167,3 @@ gdb_test "ptype \$bitfields" \ load_description "core-only.xml" "" # The extra register from the previous description should be gone. gdb_test "ptype \$extrareg" "type = void" - -foreach src ${core-regs} { - remote_file host delete $remote_filename($src) -} diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e175833..93b004f 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3517,15 +3517,21 @@ proc gdb_touch_execfile { binfile } { # standard_output_file to compute the destination. proc gdb_remote_download {dest fromfile {tofile {}}} { + global cleanfiles + if {$dest == "host" && ![is_remote host] && $tofile == ""} { set tofile [standard_output_file [file tail $fromfile]] } if { $tofile == "" } { - return [remote_download $dest $fromfile] + set destname [remote_download $dest $fromfile] } else { - return [remote_download $dest $fromfile $tofile] + set destname [remote_download $dest $fromfile $tofile] } + # Keep track of downloaded files and remove them when tests are + # done. + lappend cleanfiles($dest) $destname + return $destname } # gdb_download