* 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.

1 files changed, 6 insertions, 6 deletions

diff --git a/gdb/testsuite/gdb.fortran/types.exp b/gdb/testsuite/gdb.fortran/types.exp
index 0c47511..4c71b80 100644
--- a/gdb/testsuite/gdb.fortran/types.exp
+++ b/gdb/testsuite/gdb.fortran/types.exp
@@ -30,7 +30,7 @@ set bug_id 0
 # fails, then we skip the other tests.
 
 proc set_lang_fortran {} {
-    global prompt
+    global gdb_prompt
     
     if [gdb_test "set language fortran" ""] {
 	return 0;
@@ -44,7 +44,7 @@ proc set_lang_fortran {} {
 }
 
 proc test_integer_literal_types_accepted {} {
-    global prompt
+    global gdb_prompt
 
     # Test various decimal values.
 
@@ -52,7 +52,7 @@ proc test_integer_literal_types_accepted {} {
 }
 
 proc test_character_literal_types_accepted {} {
-    global prompt
+    global gdb_prompt
 
     # Test various character values.
 
@@ -60,13 +60,13 @@ proc test_character_literal_types_accepted {} {
 }
 
 proc test_integer_literal_types_rejected {} {
-    global prompt
+    global gdb_prompt
 
     test_print_reject "pt _"
 }
 
 proc test_logical_literal_types_accepted {} {
-    global prompt
+    global gdb_prompt
 
     # Test the only possible values for a logical, TRUE and FALSE.
 
@@ -75,7 +75,7 @@ proc test_logical_literal_types_accepted {} {
 }
 
 proc test_float_literal_types_accepted {} {
-    global prompt
+    global gdb_prompt
 
     # Test various floating point formats