diff options
author | Michael Chastain <mec@google.com> | 2004-09-10 01:04:59 +0000 |
---|---|---|
committer | Michael Chastain <mec@google.com> | 2004-09-10 01:04:59 +0000 |
commit | 2db8e78e679d88bbdbaf32bdfbed44382f55c0d6 (patch) | |
tree | 92fafc944bd6b3cdd668720779bc3f0c68f85646 /gdb/testsuite/gdb.gdb | |
parent | e0638f7007c3f4734c293c399570727fbf2db125 (diff) | |
download | gdb-2db8e78e679d88bbdbaf32bdfbed44382f55c0d6.zip gdb-2db8e78e679d88bbdbaf32bdfbed44382f55c0d6.tar.gz gdb-2db8e78e679d88bbdbaf32bdfbed44382f55c0d6.tar.bz2 |
2004-09-09 Michael Chastain <mec.gnu@mindspring.com>
* lib/gdb.exp (gdb_file_cmd): Revert the return value to
previous simple convention. Use a global variable to store
information about what was found.
(gdb_run_cmd): Adapt to reverted return value.
* gdb.base/remote.exp: Adapt to reverted return value.
* gdb.gdb/complaints.exp: Likewise.
* gdb.gdb/observer.exp: Likewise.
* gdb.gdb/selftest.exp: Likewise.
* gdb.gdb/xfullpath.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.gdb')
-rw-r--r-- | gdb/testsuite/gdb.gdb/complaints.exp | 15 | ||||
-rw-r--r-- | gdb/testsuite/gdb.gdb/observer.exp | 15 | ||||
-rw-r--r-- | gdb/testsuite/gdb.gdb/selftest.exp | 15 | ||||
-rw-r--r-- | gdb/testsuite/gdb.gdb/xfullpath.exp | 15 |
4 files changed, 36 insertions, 24 deletions
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp index c29053c..2dd1508 100644 --- a/gdb/testsuite/gdb.gdb/complaints.exp +++ b/gdb/testsuite/gdb.gdb/complaints.exp @@ -49,17 +49,20 @@ proc setup_test { executable } { set timeout 600 verbose "Timeout is now $timeout seconds" 2 + global gdb_file_cmd_debug_info + set gdb_file_cmd_debug_info "unset" + set result [gdb_load $executable] set timeout $oldtimeout verbose "Timeout is now $timeout seconds" 2 - if { [lindex $result 0] != "" } then { + if { $result != 0 } then { + return -1 + } + + if { $gdb_file_cmd_debug_info != "debug" } then { + untested "No debug information, skipping testcase." return -1 - } else { - if { [lsearch -exact [lrange $result 1 end] "nodebug"] >= 0 } then { - untested "No debug information, skipping testcase." - return -1 - } } # Set a breakpoint at main diff --git a/gdb/testsuite/gdb.gdb/observer.exp b/gdb/testsuite/gdb.gdb/observer.exp index 652997b..b6d43b57 100644 --- a/gdb/testsuite/gdb.gdb/observer.exp +++ b/gdb/testsuite/gdb.gdb/observer.exp @@ -47,17 +47,20 @@ proc setup_test { executable } { set timeout 600 verbose "Timeout is now $timeout seconds" 2 + global gdb_file_cmd_debug_info + set gdb_file_cmd_debug_info "unset" + set result [gdb_load $executable] set timeout $oldtimeout verbose "Timeout is now $timeout seconds" 2 - if { [lindex $result 0] != "" } then { + if { $result != 0 } then { + return -1 + } + + if { $gdb_file_cmd_debug_info != "debug" } then { + untested "No debug information, skipping testcase." return -1 - } else { - if { [lsearch -exact [lrange $result 1 end] "nodebug"] >= 0 } then { - untested "No debug information, skipping testcase." - return -1 - } } # Set a breakpoint at main diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index fb559aa..e7d46bd 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -241,17 +241,20 @@ proc test_with_self { executable } { set timeout 600 verbose "Timeout is now $timeout seconds" 2 + global gdb_file_cmd_debug_info + set gdb_file_cmd_debug_info "unset" + set result [gdb_load $executable] set timeout $oldtimeout verbose "Timeout is now $timeout seconds" 2 - if { [lindex $result 0] != "" } then { + if { $result != 0 } then { + return -1 + } + + if { $gdb_file_cmd_debug_info != "debug" } then { + untested "No debug information, skipping testcase." return -1 - } else { - if { [lsearch -exact [lrange $result 1 end] "nodebug"] >= 0 } then { - untested "No debug information, skipping testcase." - return -1 - } } # disassemble yourself diff --git a/gdb/testsuite/gdb.gdb/xfullpath.exp b/gdb/testsuite/gdb.gdb/xfullpath.exp index a506a6b..570b311 100644 --- a/gdb/testsuite/gdb.gdb/xfullpath.exp +++ b/gdb/testsuite/gdb.gdb/xfullpath.exp @@ -48,17 +48,20 @@ proc setup_test { executable } { set timeout 600 verbose "Timeout is now $timeout seconds" 2 + global gdb_file_cmd_debug_info + set gdb_file_cmd_debug_info "unset" + set result [gdb_load $executable] set timeout $oldtimeout verbose "Timeout is now $timeout seconds" 2 - if { [lindex $result 0] != "" } then { + if { $result != 0 } then { + return -1 + } + + if { $gdb_file_cmd_debug_info != "debug" } then { + untested "No debug information, skipping testcase." return -1 - } else { - if { [lsearch -exact [lrange $result 1 end] "nodebug"] >= 0 } then { - untested "No debug information, skipping testcase." - return -1 - } } # Set a breakpoint at main |