* gdb.*/*.exp: Replace $prompt with $gdb_prompt.

	* gdb.base/scope.exp: Use gdb_test.
	* gdb.c++/classes.exp: Ditto.
	* gdb.c++/inherit.exp: Ditto.

More random cleanups. Still lots to go, however.

7 files changed, 69 insertions, 69 deletions

diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index a8e79be..facb5be 100644
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -22,7 +22,7 @@ load_lib gdb.exp
 # Set gdb to target the monitor
 #
 proc gdb_target_monitor { } {
-    global prompt
+    global gdb_prompt
     global exit_status
     global timeout
 
@@ -89,7 +89,7 @@ proc gdb_load { arg } {
     global loadpath
     global loadfile
     global GDB
-    global prompt
+    global gdb_prompt
     global timeout
 
     if { $arg != "" } {
@@ -108,13 +108,13 @@ proc gdb_load { arg } {
     set timeout 1000
     verbose "Timeout is now $timeout seconds" 2
     expect {
-	-re ".*$prompt $" {
+	-re ".*$gdb_prompt $" {
 	    if { $verbose > 1 } {
 		send_user "Loaded $arg into $GDB\n"
 	    }
 	    return 1
 	}
-	-re "$prompt $"     {
+	-re "$gdb_prompt $"     {
 	    if { $verbose > 1 } {
 		perror "GDB couldn't load."
 	    }
diff --git a/gdb/testsuite/config/nind.exp b/gdb/testsuite/config/nind.exp
index f44cc58..dc8006a 100644
--- a/gdb/testsuite/config/nind.exp
+++ b/gdb/testsuite/config/nind.exp
@@ -29,7 +29,7 @@ proc gdb_load { arg } {
     global verbose
     global loadpath
     global loadfile
-    global prompt
+    global gdb_prompt
     global GDB
     set loadfile [file tail $arg]
     set loadpath [file dirname $arg]
@@ -43,7 +43,7 @@ proc gdb_start { } {
     global GDB
     global GDBFLAGS
     global spawn_id
-    global prompt
+    global gdb_prompt
     global verbose
     send_user "Not implememted yet\n" ; return -1
 }
diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp
index 771a9e1..5a393ca 100644
--- a/gdb/testsuite/config/slite.exp
+++ b/gdb/testsuite/config/slite.exp
@@ -32,7 +32,7 @@
 
 load_lib remote.exp
 load_lib gdb.exp
-set prompt "\\(gdb\\)"
+set gdb_prompt "\\(gdb\\)"
 
 #
 # gdb_load -- load a file into the GDB. 
@@ -43,7 +43,7 @@ proc gdb_load { arg } {
     global verbose
     global loadpath
     global loadfile
-    global prompt
+    global gdb_prompt
     global GDB
     global expect_out
     global gdb_spawn_id
@@ -61,8 +61,8 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$prompt $" {}
-	-i $gdb_spawn_id -re "$prompt $" { perror "GDB couldn't read file" }
+	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't read file" }
 	-i $gdb_spawn_id timeout { perror "(timeout) read symbol file" ; return -1 }
     }
 
@@ -86,8 +86,8 @@ proc gdb_load { arg } {
     set timeout 60
     verbose "Timeout is now $timeout seconds" 2
     expect {
-	-i $gdb_spawn_id -re "Remote target.*$prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARClite appears to be alive.*$prompt $"	{
+	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
+	-i $gdb_spawn_id -re ".*SPARClite appears to be alive.*$gdb_prompt $"	{
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
@@ -111,12 +111,12 @@ proc gdb_load { arg } {
 	set timeout 2400
 	verbose "Timeout is now $timeout seconds" 2
 	expect {
-	    -i $gdb_spawn_id -re "Loading.*$prompt $" {
+	    -i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
 		verbose "Loaded $arg into $GDB" 1
 		set timeout 30
 		verbose "Timeout is now $timeout seconds" 2
 	    }
-	    -i $gdb_spawn_id -re "$prompt $"     {
+	    -i $gdb_spawn_id -re "$gdb_prompt $"     {
 		if $verbose>1 then {
 		    perror "GDB couldn't load."
 		}
@@ -134,7 +134,7 @@ proc gdb_load { arg } {
     sleep 2;
     send_gdb "";
     expect {
-	-i $gdb_spawn_id -re ".*$prompt $" { verbose "Run command succeded" }
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" { verbose "Run command succeded" }
 	-i $gdb_spawn_id default {
 	    perror "error sending monitor run command";
 	}
@@ -153,7 +153,7 @@ proc gdb_load { arg } {
 	    send_gdb "y\n";
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$prompt $"	{
+	-i $gdb_spawn_id -re ".*$gdb_prompt $"	{
 	    verbose "Set remote target to [target_info serial]" 2
 	}
 	-i $gdb_spawn_id timeout {
diff --git a/gdb/testsuite/config/sparclet-old.exp b/gdb/testsuite/config/sparclet-old.exp
index ea97d19..41f5c2f 100644
--- a/gdb/testsuite/config/sparclet-old.exp
+++ b/gdb/testsuite/config/sparclet-old.exp
@@ -24,7 +24,7 @@
 
 load_lib remote.exp
 load_lib gdb.exp
-set prompt "\\(gdbslet\\)"
+set gdb_prompt "\\(gdbslet\\)"
 
 
 #
@@ -37,7 +37,7 @@ set prompt "\\(gdbslet\\)"
 #
 
 proc gdb_run_cmd {} {
-    global prompt
+    global gdb_prompt
     global gdb_spawn_id
 
     set timeout 60
@@ -74,8 +74,8 @@ proc gdb_run_cmd {} {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Remote target.*$prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$prompt $" {
+	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
+	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
@@ -90,7 +90,7 @@ proc gdb_run_cmd {} {
 
     send_gdb "disable\n";
     expect {
-	-i $gdb_spawn_id -re ".*$prompt $" {
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" {
 	    verbose "Breakpoints disabled" 2
 	}
 	-i $gdb_spawn_id timeout { 
@@ -132,7 +132,7 @@ proc gdb_run_cmd {} {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$prompt $" { 
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
 	    verbose "interrupting remote stub succeeded"
 	}
 	-i $gdb_spawn_id timeout { 
@@ -151,7 +151,7 @@ proc gdb_run_cmd {} {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$prompt $"	{
+	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
 		verbose "connected to stub at [target_info gdb_serial]" 2
 	    }
 	    -i $gdb_spawn_id timeout { 
@@ -165,7 +165,7 @@ proc gdb_run_cmd {} {
 
     send_gdb "enable\n";
     expect {
-	-i $gdb_spawn_id -re ".*$prompt $" {
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" {
 	    verbose "Breakpoints enabled" 2
 	}
 	-i $gdb_spawn_id timeout { 
@@ -190,7 +190,7 @@ proc gdb_load { arg } {
     global verbose
     global loadpath
     global loadfile
-    global prompt
+    global gdb_prompt
     global GDB
     global expect_out
     global gdb_spawn_id
@@ -215,8 +215,8 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$prompt $" {}
-	-i $gdb_spawn_id -re "$prompt $" { perror "GDB couldn't find loader" }
+	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
 	-i $gdb_spawn_id timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1
@@ -235,8 +235,8 @@ proc gdb_load { arg } {
 	send_gdb "target $protocol udp [target_info netport]\n";
     }
     expect {
-	-i $gdb_spawn_id -re "Remote target.*$prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$prompt $" {
+	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
+	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
@@ -280,7 +280,7 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$prompt $" { 
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
 	    verbose "Running loader succeeded" 
 	}
 	-i $gdb_spawn_id timeout { 
@@ -304,8 +304,8 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$prompt $" {}
-	-i $gdb_spawn_id -re "$prompt $" { perror "GDB couldn't read file" }
+	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't read file" }
 	-i $gdb_spawn_id timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1 
@@ -319,7 +319,7 @@ proc gdb_load { arg } {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$prompt $"	{
+	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
 		verbose "Set remote target to [target_info serial]" 2
 	    }
 	    -i $gdb_spawn_id timeout { 
@@ -340,12 +340,12 @@ proc gdb_load { arg } {
     set timeout 1200
     verbose "Timeout is now $timeout seconds" 2
     expect {
-	-i $gdb_spawn_id -re "Loading.*$prompt $" {
+	-i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
 	    verbose "Loaded $arg into $GDB" 1
 	    set timeout 60
 	    verbose "Timeout is now $timeout seconds" 2
 	}
-	-i $gdb_spawn_id -re "$prompt $"     {
+	-i $gdb_spawn_id -re "$gdb_prompt $"     {
 	    if $verbose>1 then {
 		perror "GDB couldn't load."
 	    }
@@ -384,8 +384,8 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Remote target.*$prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$prompt $" {
+	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
+	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
@@ -429,7 +429,7 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$prompt $" { 
+	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
 	    verbose "interrupting remote stub succeeded"
 	}
 	-i $gdb_spawn_id timeout { 
@@ -448,7 +448,7 @@ proc gdb_load { arg } {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$prompt $"	{
+	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
 		verbose "connected to stub at [target_info gdb_serial]" 2
 	    }
 	    -i $gdb_spawn_id timeout { 
diff --git a/gdb/testsuite/config/sparclet.exp b/gdb/testsuite/config/sparclet.exp
index c97f5fc..dc6199d 100644
--- a/gdb/testsuite/config/sparclet.exp
+++ b/gdb/testsuite/config/sparclet.exp
@@ -24,7 +24,7 @@
 
 load_lib remote.exp
 load_lib gdb.exp
-set prompt "\\(gdbslet\\)"
+set gdb_prompt "\\(gdbslet\\)"
 
 
 #
@@ -38,7 +38,7 @@ set prompt "\\(gdbslet\\)"
 
 proc gdb_start { } {
     global gdb_spawn_id;
-    global prompt
+    global gdb_prompt
     global GDB
 
     if { [default_gdb_start] != 0 } {
@@ -48,7 +48,7 @@ proc gdb_start { } {
     if [target_info exists baud] {
 	send_gdb "set remotebaud [target_info baud]\n"
 	expect {
-	    -i $gdb_spawn_id -re ".*$prompt" { }
+	    -i $gdb_spawn_id -re ".*$gdb_prompt" { }
 	    -i $gdb_spawn_id default { 
 		perror "Error setting baud rate."
 		return -1;
@@ -67,7 +67,7 @@ proc gdb_start { } {
 
 proc gdb_sparclet_startup { } {
     global gdb_spawn_id;
-    global prompt
+    global gdb_prompt
     global GDB
 
     set timeout 5;
@@ -79,13 +79,13 @@ proc gdb_sparclet_startup { } {
 	    gdb_send "y\n";
 	    exp_continue;
 	}
-	-i $gdb_spawn_id -re "Remote target.*connected to.*$prompt" { }
+	-i $gdb_spawn_id -re "Remote target.*connected to.*$gdb_prompt" { }
 	-i $gdb_spawn_id timeout {
 	    verbose "timed out, checking if stub is already running"
 	    set timeout 10
 	    send_gdb "\003";
 	    expect {
-		-i $gdb_spawn_id -re ".*$prompt" {
+		-i $gdb_spawn_id -re ".*$gdb_prompt" {
 		}
 		-i $gdb_spawn_id default {
 		    perror "sparclet board isn't responding";
@@ -94,7 +94,7 @@ proc gdb_sparclet_startup { } {
 	    }
 	    send_gdb "target remote [target_info gdb_serial]\n";
 	    expect {
-		-i $gdb_spawn_id -re ".*Remote debugging.*$prompt" {
+		-i $gdb_spawn_id -re ".*Remote debugging.*$gdb_prompt" {
 		    verbose "stub is already running"
 		    set is_running_stub 1;
 		}
@@ -123,8 +123,8 @@ proc gdb_sparclet_startup { } {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re "Reading symbols from.*done..*$prompt $" {}
-	    -i $gdb_spawn_id -re "$prompt $" { perror "GDB couldn't find loader" }
+	    -i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	    -i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
 	    -i $gdb_spawn_id timeout { 
 		perror "(timeout) read symbol file" ; 
 		return -1
@@ -133,7 +133,7 @@ proc gdb_sparclet_startup { } {
 
 	send_gdb "target [target_info gdb_protocol] [target_info serial]\n";
 	expect {
-	    -i $gdb_spawn_id -re "Remote target.*connected to.*$prompt" { }
+	    -i $gdb_spawn_id -re "Remote target.*connected to.*$gdb_prompt" { }
 	    -i $gdb_spawn_id default {
 		perror "Error reconnecting to sparclet.";
 		return -1;
@@ -145,12 +145,12 @@ proc gdb_sparclet_startup { } {
 	set timeout 1200
 	verbose "Timeout is now $timeout seconds" 2
 	expect {
-	    -i $gdb_spawn_id -re "Loading.*$prompt $" {
+	    -i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
 		verbose "Loaded $loader into $GDB" 1
 		set timeout 60
 		verbose "Timeout is now $timeout seconds" 2
 	    }
-	    -i $gdb_spawn_id -re "$prompt $"     {
+	    -i $gdb_spawn_id -re "$gdb_prompt $"     {
 		if $verbose>1 then {
 		    perror "GDB couldn't load."
 		}
@@ -193,7 +193,7 @@ proc gdb_sparclet_startup { } {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$prompt $" { 
+	    -i $gdb_spawn_id -re ".*$gdb_prompt $" { 
 		verbose "Running loader succeeded" 
 	    }
 	    -i $gdb_spawn_id timeout { 
@@ -213,12 +213,12 @@ proc gdb_sparclet_startup { } {
 
 proc gdb_run_cmd { args } {
     global gdb_spawn_id
-    global prompt
+    global gdb_prompt
 
     gdb_breakpoint exit;
     send_gdb "set \$fp=0\n";
     expect {
-	-i $gdb_spawn_id -re ".*$prompt" { }
+	-i $gdb_spawn_id -re ".*$gdb_prompt" { }
     }
     send_gdb "jump start\n";
     expect {
@@ -243,7 +243,7 @@ proc gdb_load { arg } {
     global verbose
     global loadpath
     global loadfile
-    global prompt
+    global gdb_prompt
     global GDB
     global expect_out
     global gdb_spawn_id
@@ -267,8 +267,8 @@ proc gdb_load { arg } {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$prompt $" {}
-	-i $gdb_spawn_id -re "$prompt $" { perror "GDB couldn't read file" }
+	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't read file" }
 	-i $gdb_spawn_id timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1 
@@ -282,7 +282,7 @@ proc gdb_load { arg } {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$prompt $"	{
+	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
 		verbose "Set remote target to [target_info serial]" 2
 	    }
 	    -i $gdb_spawn_id timeout { 
@@ -303,12 +303,12 @@ proc gdb_load { arg } {
     set timeout 1200
     verbose "Timeout is now $timeout seconds" 2
     expect {
-	-i $gdb_spawn_id -re "Loading.*$prompt $" {
+	-i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
 	    verbose "Loaded $arg into $GDB" 1
 	    set timeout 60
 	    verbose "Timeout is now $timeout seconds" 2
 	}
-	-i $gdb_spawn_id -re "$prompt $"     {
+	-i $gdb_spawn_id -re "$gdb_prompt $"     {
 	    if $verbose>1 then {
 		perror "GDB couldn't load."
 	    }
@@ -321,7 +321,7 @@ proc gdb_load { arg } {
     }
     send_gdb "list main\n";
     expect {
-	-i $gdb_spawn_id -re ".*$prompt" { }
+	-i $gdb_spawn_id -re ".*$gdb_prompt" { }
 	-i $gdb_spawn_id default {
 	    perror "command for list main never completed";
 	    return -1;
diff --git a/gdb/testsuite/config/udi.exp b/gdb/testsuite/config/udi.exp
index 1d49722..4c5f242 100644
--- a/gdb/testsuite/config/udi.exp
+++ b/gdb/testsuite/config/udi.exp
@@ -27,7 +27,7 @@ load_lib gdb.exp
 # Set gdb to the desired UDI target
 #
 proc gdb_target_udi { } {
-    global prompt
+    global gdb_prompt
     global verbose
     global exit_status
 
@@ -40,7 +40,7 @@ proc gdb_target_udi { } {
 	-re "target udi $targetname\[\r\n\]+" {
 	    exp_continue
 	}
-	-re "TIP UDI 1.2 Conformant.*$prompt $"	{
+	-re "TIP UDI 1.2 Conformant.*$gdb_prompt $"	{
 	    verbose "Set target to $targetname"
 	}
 	-re "TIP-ipc WARNING,.*failed:" {
@@ -73,7 +73,7 @@ proc gdb_load { arg } {
     global loadpath
     global loadfile
     global GDB
-    global prompt
+    global gdb_prompt
 
     if [gdb_file_cmd $arg] {
 	return -1 
diff --git a/gdb/testsuite/config/vx.exp b/gdb/testsuite/config/vx.exp
index c2b2632..daf826e 100644
--- a/gdb/testsuite/config/vx.exp
+++ b/gdb/testsuite/config/vx.exp
@@ -27,7 +27,7 @@ load_lib gdb.exp
 load_lib vxworks.exp
 
 set shell_prompt "->"
-set prompt "\\(vxgdb\\)"
+set gdb_prompt "\\(vxgdb\\)"
 
 #
 # gdb_version -- extract and print the version number of gcc
@@ -57,7 +57,7 @@ proc gdb_load { arg } {
 # gdb_start -- start gdb running
 #
 proc gdb_start { } {
-    global prompt
+    global gdb_prompt
     global verbose
     global connectmode
     global reboot
@@ -100,7 +100,7 @@ proc gdb_start { } {
 }
 
 proc spawn_vxgdb { } {
-    global prompt
+    global gdb_prompt
     global verbose
 
     default_gdb_start
@@ -108,7 +108,7 @@ proc spawn_vxgdb { } {
     # set the default arguments to "main", so that "run" with no
     # arguments will work correctly.
     send "set args main\n"
-    expect -re ".*$prompt $" {}
+    expect -re ".*$gdb_prompt $" {}
 
     verbose "Setting up target, Please wait..."
     # set targets hostname
@@ -116,7 +116,7 @@ proc spawn_vxgdb { } {
     set timeout 60
     verbose "Timeout is now $timeout seconds" 2
     expect {
-	-re "Done\..*$prompt $"	{
+	-re "Done\..*$gdb_prompt $"	{
 	    verbose "Set target to [target_info netport]" 1
 	}
 	-re "net_connect: RPC: Program not registered.*$" {