From 341fddd825503e7897cf6c743f7cdd6fa96ef7df Mon Sep 17 00:00:00 2001 From: drow Date: Thu, 14 Feb 2002 06:25:17 +0000 Subject: [PATCH] 2002-02-14 Daniel Jacobowitz * gdb.base/a2-run.exp: Check for a remote target properly. * gdb.base/annota1.exp: Likewise. * gdb.base/list.exp: Likewise. * gdb.base/reread.exp: Likewise. * gdb.base/scope.exp: Likewise. * gdb.base/shlib-call.exp: Likewise. * gdb.base/term.exp: Likewise. * gdb.c++/annota2.exp: Likewise. --- gdb/testsuite/ChangeLog | 11 +++++++++++ gdb/testsuite/gdb.base/a2-run.exp | 2 +- gdb/testsuite/gdb.base/annota1.exp | 2 +- gdb/testsuite/gdb.base/list.exp | 2 +- gdb/testsuite/gdb.base/reread.exp | 4 ++-- gdb/testsuite/gdb.base/scope.exp | 2 +- gdb/testsuite/gdb.base/shlib-call.exp | 10 ++++++---- gdb/testsuite/gdb.base/term.exp | 4 ++-- gdb/testsuite/gdb.c++/annota2.exp | 2 +- 9 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 869da449de..16966783fd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2002-02-14 Daniel Jacobowitz + + * gdb.base/a2-run.exp: Check for a remote target properly. + * gdb.base/annota1.exp: Likewise. + * gdb.base/list.exp: Likewise. + * gdb.base/reread.exp: Likewise. + * gdb.base/scope.exp: Likewise. + * gdb.base/shlib-call.exp: Likewise. + * gdb.base/term.exp: Likewise. + * gdb.c++/annota2.exp: Likewise. + 2002-02-13 Richard Earnshaw * gdb.base/watchpoint.exp: Restore previous timeout at end of test. diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp index 2fc7ff086a..f822f2491a 100644 --- a/gdb/testsuite/gdb.base/a2-run.exp +++ b/gdb/testsuite/gdb.base/a2-run.exp @@ -232,7 +232,7 @@ if [istarget "*-*-vxworks*"] then { # GOAL: Test that shell is being used with "run". For remote debugging # targets, there is no guarantee that a "shell" (whatever that is) is used. -if [isnative] then { +if ![is_remote target] then { send_gdb "run `echo 8`\n" gdb_expect { -re "Starting program.*40320.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 3402855c7a..bdb5646fff 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -30,7 +30,7 @@ if $tracelevel then { # work for remote targets too) because of the different prompt we get # when using annotation level 2. # -if ![isnative] then { +if [is_remote target] then { return 0 } diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index 8c114e8770..ddd1e36bcd 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -95,7 +95,7 @@ proc test_listsize {} { # Show the default lines # The second case is for optimized code, it is still correct. - if ![isnative] { + if [is_remote target] { runto_main; unsupported "list default lines around main"; } else { diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp index f0650c4c01..5e17e11df7 100644 --- a/gdb/testsuite/gdb.base/reread.exp +++ b/gdb/testsuite/gdb.base/reread.exp @@ -100,7 +100,7 @@ gdb_test "shell touch ${binfile}" "" "" set prms_id 0 -if ![isnative] { +if [is_remote target] { unsupported "run to foo() second time "; } else { gdb_run_cmd @@ -124,7 +124,7 @@ if ![isnative] { ### Second pass: verify that GDB checks the executable file's ### timestamp when the program is *restarted*, not just when it exits. -if ![isnative] { +if [is_remote target] { unsupported "second pass: GDB should check for changes before running" } else { diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 69bd84b11b..1765a44649 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -559,7 +559,7 @@ gdb_test "print 'scope0.c'::filelocal_ro" "= 201" # is responsible for clearing bss and that hasnt' happened yet. # # This is a problem for all non-native targets. -- manson -if ![isnative] { +if [is_remote target] { unsupported "print 'scope0.c'::filelocal_bss before run" } else { gdb_test "print 'scope0.c'::filelocal_bss" "= 0" \ diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index c67c81695f..d5336f46b7 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -268,14 +268,16 @@ gdb_test "break shr1" "Breakpoint 1.*" "set bp in shared library" # FIXME: should not send "run" explicitly. Non-portable. -gdb_test "run" "Starting program:.*Breakpoint 1,.*" \ +if ![is_remote target] { + gdb_test "run" "Starting program:.*Breakpoint 1,.*" \ "run to bp in shared library" -gdb_test "cont" ".*Program exited normally..*" + gdb_test "cont" ".*Program exited normally..*" -gdb_test "run" "Starting program:.*Breakpoint 1,.*" \ + gdb_test "run" "Starting program:.*Breakpoint 1,.*" \ "re-run to bp in shared library (PR's 16495, 18213)" -gdb_test "cont" ".*Program exited normally..*" + gdb_test "cont" ".*Program exited normally..*" +} return 0 diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp index 53ef52ee7c..1a64531129 100644 --- a/gdb/testsuite/gdb.base/term.exp +++ b/gdb/testsuite/gdb.base/term.exp @@ -24,8 +24,8 @@ if $tracelevel then { strace $tracelevel } -# This only works for native, I think. -if ![isnative] then { +# Don't try this for remote targets. +if [is_remote target] then { continue } diff --git a/gdb/testsuite/gdb.c++/annota2.exp b/gdb/testsuite/gdb.c++/annota2.exp index 6f9a3eadb0..a134709378 100644 --- a/gdb/testsuite/gdb.c++/annota2.exp +++ b/gdb/testsuite/gdb.c++/annota2.exp @@ -46,7 +46,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb # work for remote targets too) because of the different prompt we get # when using annotation level 2. # -if ![isnative] then { +if [is_remote target] then { return 0 } -- 2.11.0