Don't remove files copied to host

Nowadays, if we do in-tree build and run tests sequentially, some source
files are removed, due to the following pattern:

set pi_txt [gdb_remote_download host ${srcdir}/${subdir}/pi.txt]

remote_exec host "rm -f $pi_txt"

If testing is run sequentially, file ${srcdir}/${subdir}/pi.txt is
copied to ${objdir}/${subdir}/pi.txt.  However, ${objdir} is ${srcdir}
in the in-tree build/test, so the file is coped to itself, as a nop.
As a result, the file in source is removed at the end of test.

This patch fixes this problem by not removing files copied to host in
each test.  This patch also addresses the question we've had that why
don't we keep files copied to host because they are needed to reproduce
certain fails.

gdb/testsuite:

2014-10-20  Yao Qi  <yao@codesourcery.com>

	* gdb.base/checkpoint.exp: Don't 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-framefilter.exp: Likewise.
	* gdb.python/py-mi.exp: Likewise.
	* gdb.python/py-objfile-script.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.
This commit is contained in:
Yao Qi 2014-09-29 20:47:30 +08:00
parent c6ecbe44d8
commit acbdb7f355
23 changed files with 33 additions and 62 deletions

View File

@ -1,3 +1,28 @@
2014-10-20 Yao Qi <yao@codesourcery.com>
* gdb.base/checkpoint.exp: Don't 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-framefilter.exp: Likewise.
* gdb.python/py-mi.exp: Likewise.
* gdb.python/py-objfile-script.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.
2014-10-18 Kwok Cheung Yeung <kcy@codesourcery.com>
* gdb.dwarf2/dw2-dir-file-name.exp (addr_len): New.

View File

@ -371,5 +371,3 @@ verbose "Timeout now $timeout sec."
#
# Finished: cleanup
#
remote_exec host "rm -f $pi_txt"

View File

@ -82,6 +82,4 @@ gdb_test "next" \
".*RETURN \\(j\\);.*" \
"next over dummy 10"
remote_file host delete ${remote_linefile}
return 0

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -188,8 +188,6 @@ gdb_test_multiple "bt 1" $test {
}
}
remote_file host delete ${remote_python_file}
# Test with no debuginfo
# We cannot use prepare_for_testing as we have to set the safe-patch

View File

@ -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}

View File

@ -53,5 +53,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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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}

View File

@ -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<string>"
remote_file host delete ${remote_python_file}

View File

@ -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}

View File

@ -325,6 +325,4 @@ gdb_expect 60 {
do_tests
remote_file host delete ${binfile}
return 0

View File

@ -171,7 +171,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)
}