* config/vr4300.exp: New file.

	* gdb.*/*.exp: Call gdb_expect instead of expect.

	* lib/gdb.exp(gdb_expect): New function.

16 files changed, 49 insertions, 49 deletions

diff --git a/gdb/testsuite/gdb.chill/builtins.exp b/gdb/testsuite/gdb.chill/builtins.exp
index 8597208..81569eb 100644
--- a/gdb/testsuite/gdb.chill/builtins.exp
+++ b/gdb/testsuite/gdb.chill/builtins.exp
@@ -43,20 +43,20 @@ proc set_lang_chill {} {
     verbose "loading file '$binfile'"
     gdb_load $binfile
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break xx_\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n" 
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
diff --git a/gdb/testsuite/gdb.chill/callch.exp b/gdb/testsuite/gdb.chill/callch.exp
index 5cbf7fa..b73e0c5 100644
--- a/gdb/testsuite/gdb.chill/callch.exp
+++ b/gdb/testsuite/gdb.chill/callch.exp
@@ -49,7 +49,7 @@ proc do_tests {} {
     send_gdb "set language chill\n" ; 
 
     gdb_test "break callch.ch:48 ""
-    send_gdb "run\n"; expect -re "Breakpoint .*callch.ch:48.*$gdb_prompt $"
+    send_gdb "run\n"; gdb_expect -re "Breakpoint .*callch.ch:48.*$gdb_prompt $"
     gdb_test {set fred(10, i)} {a is '10'; b is '12'.}
     gdb_test_exact "call klaus()" {here's klaus calling.}
     gdb_test_exact "call fred()" {too few arguments in function call}
diff --git a/gdb/testsuite/gdb.chill/chexp.exp b/gdb/testsuite/gdb.chill/chexp.exp
index bdc100d..fe039e0 100644
--- a/gdb/testsuite/gdb.chill/chexp.exp
+++ b/gdb/testsuite/gdb.chill/chexp.exp
@@ -33,13 +33,13 @@ proc set_lang_chill {} {
     global gdb_prompt
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    return 1
diff --git a/gdb/testsuite/gdb.chill/enum.exp b/gdb/testsuite/gdb.chill/enum.exp
index d5ec0e9..724382a 100644
--- a/gdb/testsuite/gdb.chill/enum.exp
+++ b/gdb/testsuite/gdb.chill/enum.exp
@@ -45,7 +45,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
@@ -69,7 +69,7 @@ if ![set_lang_chill] then {
     runto hugo_
 
     send_gdb "set var \$i := d\n"
-    expect -re ".*$gdb_prompt $"
+    gdb_expect -re ".*$gdb_prompt $"
     gdb_test "print \$i" { = d}
     gdb_test "print size (\$i)" { = 1}
     gdb_test "print b+c" { = 3}
diff --git a/gdb/testsuite/gdb.chill/gch1041.exp b/gdb/testsuite/gdb.chill/gch1041.exp
index 3b035ab..0fbedb6 100644
--- a/gdb/testsuite/gdb.chill/gch1041.exp
+++ b/gdb/testsuite/gdb.chill/gch1041.exp
@@ -46,7 +46,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
diff --git a/gdb/testsuite/gdb.chill/gch1272.exp b/gdb/testsuite/gdb.chill/gch1272.exp
index 3377c2d..2517473 100644
--- a/gdb/testsuite/gdb.chill/gch1272.exp
+++ b/gdb/testsuite/gdb.chill/gch1272.exp
@@ -45,7 +45,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
         -re ".*$gdb_prompt $" {}
         timeout { fail "set language chill (timeout)" ; return 0 }
     }
diff --git a/gdb/testsuite/gdb.chill/gch1280.exp b/gdb/testsuite/gdb.chill/gch1280.exp
index 1786ccf..a00df833 100644
--- a/gdb/testsuite/gdb.chill/gch1280.exp
+++ b/gdb/testsuite/gdb.chill/gch1280.exp
@@ -45,7 +45,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
         -re ".*$gdb_prompt $" {}
         timeout { fail "set language chill (timeout)" ; return 0 }
     }
diff --git a/gdb/testsuite/gdb.chill/gch922.exp b/gdb/testsuite/gdb.chill/gch922.exp
index f2d023e..247e3de 100644
--- a/gdb/testsuite/gdb.chill/gch922.exp
+++ b/gdb/testsuite/gdb.chill/gch922.exp
@@ -47,20 +47,20 @@ proc set_lang_chill {} {
     verbose "loading file '$binfile'"
     gdb_load $binfile
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break xx_\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n" 
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
@@ -125,11 +125,11 @@ proc test_chars {} {
     gdb_test "set var a := (100)'\^(0,255)' ""
     test_print_accept "print a" {"\^\(0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255\)"}
 
-    send_gdb "set var a := (10)'\^(1)'//(26)\"\^(66,67)\"//\" \"//'I'//' '//'a'//'m'//\" Hugo\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := (10)'\^(1)'//(26)\"\^(66,67)\"//\" \"//'I'//' '//'a'//'m'//\" Hugo\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {"\^\(1,1,1,1,1,1,1,1,1,1\)BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC I am Hugo"}
-    send_gdb "set var b := \"Hugo \"\"\^(3,4)\"\"Otto\^(17)\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var b := \"Hugo \"\"\^(3,4)\"\"Otto\^(17)\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print b" {"Hugo ""\^\(3,4\)""Otto\^\(17\)"}
-    send_gdb "set var c := (70)'b' // \"\^(2,3)Hugo \" // (70)'c' \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var c := (70)'b' // \"\^(2,3)Hugo \" // (70)'c' \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print c" {'b'<repeats 70 times>//"\^\(2,3\)Hugo "//'c'<repeats 70 times>}
     gdb_test "set var d := '\^(199)' ""
     test_print_accept "print d" {'\^\(199\)'}
@@ -137,15 +137,15 @@ proc test_chars {} {
     test_print_accept "print (10)'\^(0)'//(26)\"\^(66,67)\"//\" \"//'I'//' '//'a'//'m'//\" Hugo\"" {"\^\(0,0,0,0,0,0,0,0,0,0\)BCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBC I am Hugo"}
     test_print_accept "print \"Jason\"\"\^(0,5)\"\"Hugo\^(10)\"" {"Jason""\^\(0,5\)""Hugo\^\(10\)"}
 
-    send_gdb "set var a := \"\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := \"\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {""}
-    send_gdb "set var a := \"\"\"\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := \"\"\"\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {""""}
-    send_gdb "set var a := \" \"\"\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := \" \"\"\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {" """}
-    send_gdb "set var a := \"\^\^\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := \"\^\^\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {"\^\^"}
-    send_gdb "set var a := \"'\" \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set var a := \"'\" \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print a" {"'"}
 }
 
diff --git a/gdb/testsuite/gdb.chill/gch981.exp b/gdb/testsuite/gdb.chill/gch981.exp
index 361389c..3cf75f6 100644
--- a/gdb/testsuite/gdb.chill/gch981.exp
+++ b/gdb/testsuite/gdb.chill/gch981.exp
@@ -47,20 +47,20 @@ proc set_lang_chill {} {
     verbose "loading file '$binfile'"
     gdb_load $binfile
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break xx_\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n" 
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
@@ -121,7 +121,7 @@ proc test_power {} {
     test_print_accept "print SIZE(v1_power1)" "1"
 
     gdb_test "set v1_power1 := \[b1\]  ""
-#   if GDB has rejected the improper values, we have to expect the same!
+#   if GDB has rejected the improper values, we have to gdb_expect the same!
     test_print_accept "print v1_power1" {\[e1:e5\]}
 
     gdb_test "set v1_power1 := \[a1,a2\]  ""
@@ -171,7 +171,7 @@ proc test_power {} {
     gdb_test "set v_power3 := \[b5:b7, b1\]  ""
     test_print_accept "print v_power3" {\[b1, b5:b7\]}
 
-    send_gdb "set v_power4 := \[\"b\"\] \n" ; expect -re "$gdb_prompt $"
+    send_gdb "set v_power4 := \[\"b\"\] \n" ; gdb_expect -re "$gdb_prompt $"
     test_print_accept "print v_power4" {\['b':'x'\]}
     gdb_test "set v_power4 := \[5\]  ""
     test_print_accept "print v_power4" {\['b':'x'\]}
diff --git a/gdb/testsuite/gdb.chill/misc.exp b/gdb/testsuite/gdb.chill/misc.exp
index f064adc..8911a85 100644
--- a/gdb/testsuite/gdb.chill/misc.exp
+++ b/gdb/testsuite/gdb.chill/misc.exp
@@ -46,7 +46,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
@@ -94,7 +94,7 @@ if ![set_lang_chill] then {
     gdb_test "print array () ubyte (foo)" { = \[\(0:11\): 0\]}
 	
     send_gdb "set var \$i := foo\n"
-    expect -re ".*$gdb_prompt $"
+    gdb_expect -re ".*$gdb_prompt $"
     setup_xfail "m68*-*-hpux*"
     gdb_test "print/x array () byte (\$i)" { = \[\(0:11\): H'0\]}
 }
diff --git a/gdb/testsuite/gdb.chill/powerset.exp b/gdb/testsuite/gdb.chill/powerset.exp
index 525e03c..8ecee6c 100644
--- a/gdb/testsuite/gdb.chill/powerset.exp
+++ b/gdb/testsuite/gdb.chill/powerset.exp
@@ -43,20 +43,20 @@ proc set_lang_chill {} {
     verbose "loading file '$binfile'"
     gdb_load $binfile
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break xx_\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n" 
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
diff --git a/gdb/testsuite/gdb.chill/pr-5984.exp b/gdb/testsuite/gdb.chill/pr-5984.exp
index 206413e..b4f77b3 100644
--- a/gdb/testsuite/gdb.chill/pr-5984.exp
+++ b/gdb/testsuite/gdb.chill/pr-5984.exp
@@ -49,8 +49,8 @@ proc do_tests {} {
     send_gdb "set language chill\n" ; 
 
     gdb_test "break pr-5984.ch:6 ""
-    send_gdb "run\n"; expect -re "Breakpoint .*pr-5984.ch:6"
-    expect -re "$gdb_prompt $"
+    send_gdb "run\n"; gdb_expect -re "Breakpoint .*pr-5984.ch:6"
+    gdb_expect -re "$gdb_prompt $"
     gdb_test "next" "Jason Dark.*" "next over Jason Dark"
 }
 
diff --git a/gdb/testsuite/gdb.chill/pr-6292.exp b/gdb/testsuite/gdb.chill/pr-6292.exp
index 1fae71a..c9f43fc 100644
--- a/gdb/testsuite/gdb.chill/pr-6292.exp
+++ b/gdb/testsuite/gdb.chill/pr-6292.exp
@@ -49,7 +49,7 @@ proc do_tests {} {
     send_gdb "set language chill\n" ; 
 
     gdb_test "break pr-6292.ch:15 ""
-    send_gdb "run\n"; expect -re "Breakpoint .*pr-6292.ch:15.*$gdb_prompt $"
+    send_gdb "run\n"; gdb_expect -re "Breakpoint .*pr-6292.ch:15.*$gdb_prompt $"
     gdb_test_exact "call klaus()" {here's klaus calling.}
     gdb_test {set fred(10, i)} {a was '10'; b was '12'.}
     gdb_test "print i" { = 13} "print i after call"
diff --git a/gdb/testsuite/gdb.chill/pr-9946.exp b/gdb/testsuite/gdb.chill/pr-9946.exp
index 40d73b0..df28c73 100644
--- a/gdb/testsuite/gdb.chill/pr-9946.exp
+++ b/gdb/testsuite/gdb.chill/pr-9946.exp
@@ -46,7 +46,7 @@ proc set_lang_chill {} {
     gdb_load $binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
         -re ".*$gdb_prompt $" {}
         timeout { fail "set language chill (timeout)" ; return 0 }
     }
diff --git a/gdb/testsuite/gdb.chill/tests1.exp b/gdb/testsuite/gdb.chill/tests1.exp
index 8a0be28..37156a7 100644
--- a/gdb/testsuite/gdb.chill/tests1.exp
+++ b/gdb/testsuite/gdb.chill/tests1.exp
@@ -43,20 +43,20 @@ proc set_lang_chill {} {
     verbose "loading file '$binfile'"
     gdb_load $binfile
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break dummyfunc\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n" 
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
diff --git a/gdb/testsuite/gdb.chill/tests2.exp b/gdb/testsuite/gdb.chill/tests2.exp
index a162e31..35e37a6 100644
--- a/gdb/testsuite/gdb.chill/tests2.exp
+++ b/gdb/testsuite/gdb.chill/tests2.exp
@@ -55,20 +55,20 @@ proc set_lang_chill {} {
     gdb_load $objdir/$subdir/$binfile
 
     send_gdb "set language chill\n"
-    expect {
+    gdb_expect {
 	-re ".*$gdb_prompt $" {}
 	timeout { fail "set language chill (timeout)" ; return 0 }
     }
 
     send_gdb "show language\n"
-    expect {
+    gdb_expect {
 	-re ".* source language is \"chill\".*$gdb_prompt $" {
 	    pass "set language to \"chill\""
 	    send_gdb "break dummyfunc\n"
-	    expect {
+	    gdb_expect {
 		-re ".*$gdb_prompt $" {
 		    send_gdb "run\n"
-		    expect -re ".*$gdb_prompt $" {}
+		    gdb_expect -re ".*$gdb_prompt $" {}
 		    return 1
 		}
 		timeout {
@@ -117,7 +117,7 @@ proc test_write { args } {
 
     verbose "setting var $value..."
     send_gdb "set var $location.m$extended := $value\n"
-    expect -re ".*$gdb_prompt $" {}
+    gdb_expect -re ".*$gdb_prompt $" {}
     gdb_test "print $location" \
       ".*= \[\[\]\\.p1: 2863311530, \\.m: $matchval, \\.p2: 1431655765\[\]\]"\
       "$message"