OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2002-12-16 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* lib/mi-support.exp (mi_reinitialize_dir): Check mi level
        to see whether we are using the new -environment-directory
        command which resets via -r or the old version of the command
        which may prompt the user.  Part of fix for gdb/741.
This commit is contained in:
Jeff Johnston 2002-12-16 20:03:17 +00:00
parent c029e1474f
commit da81390ba6
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2002-12-16 Jeff Johnston <jjohnstn@redhat.com>
* lib/mi-support.exp (mi_reinitialize_dir): Check mi level
to see whether we are using the new -environment-directory
command which resets via -r or the old version of the command
which may prompt the user. Part of fix for gdb/741.
2002-12-13 Andrew Cagney <ac131313@redhat.com>
* gdb.fortran/types.exp: Update obsolete comment.

16
gdb/testsuite/lib/mi-support.exp
View File

@ -234,6 +234,7 @@ proc mi_delete_breakpoints {} {
proc mi_gdb_reinitialize_dir { subdir } {
global mi_gdb_prompt
global MIFLAGS
global suppress_flag
if { $suppress_flag } {
@ -244,8 +245,9 @@ proc mi_gdb_reinitialize_dir { subdir } {
return "";
}
send_gdb "104-environment-directory\n"
gdb_expect 60 {
if { $MIFLAGS == "-i=mi1" } {
send_gdb "104-environment-directory\n"
gdb_expect 60 {
-re ".*Reinitialize source path to empty.*y or n. " {
warning "Got confirmation prompt for dir reinitialization."
send_gdb "y\n"
@ -256,6 +258,14 @@ proc mi_gdb_reinitialize_dir { subdir } {
}
-re "$mi_gdb_prompt$" {}
timeout {error "Dir reinitialization failed (timeout)"}
}
} else {
send_gdb "104-environment-directory -r\n"
gdb_expect 60 {
-re "104\\\^done,source-path=.*\r\n$mi_gdb_prompt$" {}
-re "$mi_gdb_prompt$" {}
timeout {error "Dir reinitialization failed (timeout)"}
}
}
send_gdb "105-environment-directory $subdir\n"
@ -263,7 +273,7 @@ proc mi_gdb_reinitialize_dir { subdir } {
-re "Source directories searched.*$mi_gdb_prompt$" {
verbose "Dir set to $subdir"
}
-re "105\\\^done\r\n$mi_gdb_prompt$" {
-re "105\\\^done.*\r\n$mi_gdb_prompt$" {
# FIXME: We return just the prompt for now.
verbose "Dir set to $subdir"
# perror "Dir \"$subdir\" failed."