From f24fce77816b17011fdd159f529d1b2dceb4fdac Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 12 Nov 2009 15:15:26 +0000 Subject: * gdb.base/step-line.exp: Copy step-line.inp to the remote host. * gdb.dwarf2/dw2-basic.exp: Copy file1.txt to the remote host. * gdb.dwarf2/dw2-compressed.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-prettyprint.exp (run_lang_tests): Copy py-prettyprint.py to the remote host. * gdb.python/py-mi.exp: Copy py-mi.py to the remote host. --- gdb/testsuite/ChangeLog | 13 +++++++++++++ gdb/testsuite/gdb.base/step-line.exp | 6 ++++++ gdb/testsuite/gdb.dwarf2/dw2-basic.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/dw2-compressed.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/dw2-intercu.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/dw2-intermix.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/dw2-producer.exp | 5 +++++ gdb/testsuite/gdb.dwarf2/mac-fileno.exp | 5 +++++ gdb/testsuite/gdb.python/py-mi.exp | 6 +++++- gdb/testsuite/gdb.python/py-prettyprint.exp | 8 ++++++-- 10 files changed, 60 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8581887..d50ccc2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2009-11-12 Nathan Froyd + + * gdb.base/step-line.exp: Copy step-line.inp to the remote host. + * gdb.dwarf2/dw2-basic.exp: Copy file1.txt to the remote host. + * gdb.dwarf2/dw2-compressed.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-prettyprint.exp (run_lang_tests): Copy + py-prettyprint.py to the remote host. + * gdb.python/py-mi.exp: Copy py-mi.py to the remote host. + 2009-11-11 Keith Seitz * gdb.cp/classes.cc (ByAnyOtherName): Add typedef and diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index 7d1ef1f..97eb3a1 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -26,6 +26,7 @@ if $tracelevel then { set testfile step-line set srcfile ${testfile}.c +set linefile ${testfile}.inp set binfile ${objdir}/${subdir}/${testfile} remote_exec build "rm -f ${binfile}" @@ -44,6 +45,8 @@ if ![runto_main] then { return 0 } +set remote_linefile [remote_download host ${srcdir}/${subdir}/${linefile}] + gdb_test "break f1" ".*Breakpoint 2 at .* file step-line.c.*" "break f1" gdb_test "continue" \ "Continuing.*Breakpoint 2, f1 \\(i=4\\).*dummy \\(1, i\\);" \ @@ -90,4 +93,7 @@ gdb_test "next" \ 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-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index 85dcae8..8fc3074 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -27,6 +27,7 @@ if {![istarget *-*-linux*] } set testfile "dw2-basic" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -47,6 +48,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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 6c53445..b08c635 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -27,6 +27,7 @@ if {![istarget *-*-linux*] } set testfile "dw2-compressed" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -47,6 +48,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index f1073f4..b9059b8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -27,6 +27,7 @@ if {![istarget *-*-linux*] } set testfile "dw2-intercu" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -47,6 +48,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index 4dc7d29..29c8df8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -27,6 +27,7 @@ if {![istarget *-*-linux*] } set testfile "dw2-intermix" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -47,6 +48,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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 f6245d2..f679339 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -25,6 +25,7 @@ if {![istarget *-*-linux*] } set testfile "dw2-producer" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -45,6 +46,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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 71efd6a..8b1426f 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -28,6 +28,7 @@ if {![istarget *-*-linux*] } set testfile "mac-fileno" +set dwarf_srcfile "file1.txt" set srcfile ${testfile}.S set binfile ${objdir}/${subdir}/${testfile}.x @@ -48,6 +49,10 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} +set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] + gdb_test "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-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp index 30d6f32..2387c7d 100644 --- a/gdb/testsuite/gdb.python/py-mi.exp +++ b/gdb/testsuite/gdb.python/py-mi.exp @@ -43,7 +43,9 @@ if {[lsearch -exact [mi_get_features] python] < 0} { mi_runto main -mi_gdb_test "python execfile ('${srcdir}/${subdir}/${testfile}.py')" "" +set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py] + +mi_gdb_test "python execfile ('${remote_python_file}')" "" mi_continue_to_line [gdb_get_line_number {MI breakpoint here} ${testfile}.c] \ "step to breakpoint" @@ -232,3 +234,5 @@ mi_continue_to_line \ "step to second breakpoint" mi_varobj_update_with_type_change container int 0 "update after type change" + +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 b4b3776..14119f0 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -72,8 +72,10 @@ proc run_lang_tests {lang} { gdb_test "b [gdb_get_line_number {break to inspect} ${testfile}.c ]" \ ".*Breakpoint.*" gdb_test "continue" ".*Breakpoint.*" - - gdb_test "python execfile ('${srcdir}/${subdir}/${testfile}.py')" "" + + set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py] + + gdb_test "python execfile ('${remote_python_file}')" "" gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" gdb_test "print ssa\[1\]" " = a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>" @@ -103,6 +105,8 @@ proc run_lang_tests {lang} { gdb_test "print c" " = container $hex \"container\" with 2 elements = {$nl *.0. = 23,$nl *.1. = 72$nl}" gdb_test "continue" "Program exited normally\." + + remote_file host delete ${remote_python_file} } run_lang_tests "c" -- cgit v1.1