From 3fae92fc2aed37c78df4610f3c52e2fc242846b0 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 13 May 2014 11:41:03 +0800 Subject: [PATCH] Copy file1.txt to remote host in dw2-filename.exp and dw2-anonymous-func.exp Some gdb.dwarf2/*.exp tests copy file1.txt to host via gdb_remote_download but dw2-filename.exp and dw2-anonymous-func.exp don't do that. Looks like an oversight in this patch https://sourceware.org/ml/gdb-patches/2013-08/msg00365.html There are some fails in remote host testing. FAIL: gdb.dwarf2/dw2-anonymous-func.exp: list file1.txt FAIL: gdb.dwarf2/dw2-filename.exp: interpreter-exec mi -file-list-exec-source-files FAIL: gdb.dwarf2/dw2-filename.exp: info sources This patch is to invoke gdb_remote_download to copy file1.txt to host and remote it at the end. This patch fixes these fails above. gdb/testsuite: 2014-05-16 Yao Qi * gdb.dwarf2/dw2-filename.exp: Copy file1.txt to host. Remove file1.txt from host at the end. * gdb.dwarf2/dw2-anonymous-func.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/dw2-filename.exp | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2c1d3df..11c8d8e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-16 Yao Qi + + * gdb.dwarf2/dw2-filename.exp: Copy file1.txt to host. Remove + file1.txt from host at the end. + * gdb.dwarf2/dw2-anonymous-func.exp: Likewise. + 2014-05-15 Doug Evans * gdb.dwarf2/fission-reread.S: Remove directory from .dwo file path. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp index d363a19..029104b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp @@ -29,6 +29,11 @@ if {[prepare_for_testing_full $testfile.exp \ return -1 } +set remote_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-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp index 9575504..c9ead97 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp @@ -22,11 +22,15 @@ if {![dwarf2_support]} { } standard_testfile .S +set dwarf_srcfile "file1.txt" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {nodebug}] != "" } { return -1 } +set remote_dwarf_srcfile [gdb_remote_download host \ + ${srcdir}/${subdir}/${dwarf_srcfile}] + clean_restart ${testfile} # Verify that -file-list-exec-source-files returns a list where @@ -38,3 +42,5 @@ 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} -- 2.7.4