* *.exp: The end-all be-all of quoting fixes. Ha.

At least I hope so.

25 files changed, 108 insertions, 104 deletions

diff --git a/gdb/testsuite/gdb.chill/ChangeLog b/gdb/testsuite/gdb.chill/ChangeLog
index ec22e21..f63076b 100644
--- a/gdb/testsuite/gdb.chill/ChangeLog
+++ b/gdb/testsuite/gdb.chill/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 10 15:01:55 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* *.exp: The end-all be-all of quoting fixes. Ha.
+
 Thu Aug 21 10:31:23 1997  Bob Manson  <manson@charmed.cygnus.com>
 
 	* enum.exp: More quoting fixes.
diff --git a/gdb/testsuite/gdb.chill/callch.exp b/gdb/testsuite/gdb.chill/callch.exp
index 6ed53ca..c579a05 100644
--- a/gdb/testsuite/gdb.chill/callch.exp
+++ b/gdb/testsuite/gdb.chill/callch.exp
@@ -48,7 +48,7 @@ proc do_tests {} {
 
     send_gdb "set language chill\n" ; 
 
-    gdb_test "break callch.ch:48 ""
+    gdb_test "break callch.ch:48" ""
     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.}
diff --git a/gdb/testsuite/gdb.chill/chillvars.exp b/gdb/testsuite/gdb.chill/chillvars.exp
index 57b534d..f37c94d 100644
--- a/gdb/testsuite/gdb.chill/chillvars.exp
+++ b/gdb/testsuite/gdb.chill/chillvars.exp
@@ -46,16 +46,16 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     # This is needed (at least on SunOS4) to make sure the
     # the symbol table is read.
-    gdb_test "break chillvars.ch:3 ""
-    gdb_test "delete 1 ""
+    gdb_test "break chillvars.ch:3" ""
+    gdb_test "delete 1" ""
 
-    gdb_test "set width 0 ""
-    gdb_test "set print sevenbit-strings ""
-    gdb_test "set print address off ""
+    gdb_test "set width 0" ""
+    gdb_test "set print sevenbit-strings" ""
+    gdb_test "set print address off" ""
 
     test_BOOL
     test_CHAR
diff --git a/gdb/testsuite/gdb.chill/extstruct.exp b/gdb/testsuite/gdb.chill/extstruct.exp
index a42d6e6..39d61cb 100644
--- a/gdb/testsuite/gdb.chill/extstruct.exp
+++ b/gdb/testsuite/gdb.chill/extstruct.exp
@@ -54,12 +54,12 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
-    gdb_test "set var \$i := m_x\[\] ""
+    gdb_test "set var \$i := m_x\[\]" ""
     gdb_test "print \$i" { = \[.i: 0, .ar: \[\(5:6\): \[.f1: 0, .f2: NULL, .f3: \[\(2:3\): 0\]\]\]\]}
 
-    gdb_test "set var \$j := m_y\[\] ""
+    gdb_test "set var \$j := m_y\[\]" ""
     gdb_test "print \$j" { = \[.i: 0, .ar: \[\(7:8\): \[\(9:10\): \[.f1: 0, .f2: NULL, .f3: \[\(2:3\): 0\]\]\]\]\]}
 }
 
diff --git a/gdb/testsuite/gdb.chill/gch1272.exp b/gdb/testsuite/gdb.chill/gch1272.exp
index 49fdb76..db60715 100644
--- a/gdb/testsuite/gdb.chill/gch1272.exp
+++ b/gdb/testsuite/gdb.chill/gch1272.exp
@@ -75,7 +75,7 @@ if ![set_lang_chill] then {
 
     # check bar
     gdb_test {print bar} { = \[\(-10:20\): \[.i: 0, .b: FALSE\]\]}
-    gdb_test "set var bar := m_bar\[\(\*\): \[42, TRUE\]\] ".*"
+    gdb_test "set var bar := m_bar\[\(\*\): \[42, TRUE\]\]" ".*"
     gdb_test {print bar} { = \[\(-10:20\): \[.i: 42, .b: TRUE\]\]}
 
     # some failues
diff --git a/gdb/testsuite/gdb.chill/gch1280.exp b/gdb/testsuite/gdb.chill/gch1280.exp
index fbdc850..216625d 100644
--- a/gdb/testsuite/gdb.chill/gch1280.exp
+++ b/gdb/testsuite/gdb.chill/gch1280.exp
@@ -71,6 +71,6 @@ if ![set_lang_chill] then {
     # check too many array elements
     gdb_test {set var v_x := [1,2,3,4,5]} {Too many array elements}
     gdb_test {set var $i := m_x[(3): 22, 25]} {Too many array elements}
-    gdb_test "set var \$i := m_x\[\(2\): 22, 25\] ""
+    gdb_test "set var \$i := m_x\[\(2\): 22, 25\]" ""
     gdb_test {print $i} { = \[\(1\): 0, \(2\): 22, \(3\): 25\]}
 }
diff --git a/gdb/testsuite/gdb.chill/gch922.exp b/gdb/testsuite/gdb.chill/gch922.exp
index 3d2b8d2..c0fb6dc 100644
--- a/gdb/testsuite/gdb.chill/gch922.exp
+++ b/gdb/testsuite/gdb.chill/gch922.exp
@@ -122,7 +122,7 @@ proc test_chars {} {
     test_print_accept "print c" {'a'<repeats 70 times>//"\^\(0,5\)Jason"//'b'<repeats 70 times>}
     test_print_accept "print d" {'\^\(11\)'}
 
-    gdb_test "set var a := (100)'\^(0,255)' ""
+    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" ; gdb_expect -re "$gdb_prompt $"
@@ -131,7 +131,7 @@ proc test_chars {} {
     test_print_accept "print b" {"Hugo ""\^\(3,4\)""Otto\^\(17\)"}
     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)' ""
+    gdb_test "set var d := '\^(199)'" ""
     test_print_accept "print d" {'\^\(199\)'}
 
     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"}
diff --git a/gdb/testsuite/gdb.chill/gch981.exp b/gdb/testsuite/gdb.chill/gch981.exp
index 197ed85..3a948b1 100644
--- a/gdb/testsuite/gdb.chill/gch981.exp
+++ b/gdb/testsuite/gdb.chill/gch981.exp
@@ -120,105 +120,105 @@ proc test_power {} {
     test_print_accept "print v2_power1" {\[\]}
     test_print_accept "print SIZE(v1_power1)" "1"
 
-    gdb_test "set v1_power1 := \[b1\]  ""
+    gdb_test "set v1_power1 := \[b1\]"  ""
 #   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\]  ""
+    gdb_test "set v1_power1 := \[a1,a2\]"  ""
     test_print_accept "print v1_power1" {\[e1:e5\]}
-    gdb_test "set v1_power1 := \[b1,b2,b3,e4\]  ""
+    gdb_test "set v1_power1 := \[b1,b2,b3,e4\]"  ""
     test_print_accept "print v1_power1" {\[e1:e5\]}
-    gdb_test "set v1_power1 := \[e4:e5\]  ""
+    gdb_test "set v1_power1 := \[e4:e5\]"  ""
     test_print_accept "print v1_power1" {\[e4:e5\]}
-    gdb_test "set v1_power1 := \[e1, e2:e3, e5\]  ""
+    gdb_test "set v1_power1 := \[e1, e2:e3, e5\]"  ""
     test_print_accept "print v1_power1" {\[e1:e3, e5\]}
-    gdb_test "set v1_power1 := \[e1, e2:e4, e4:e5\]  ""
+    gdb_test "set v1_power1 := \[e1, e2:e4, e4:e5\]"  ""
     test_print_accept "print v1_power1" {\[e1:e5\]}
-    gdb_test "set v1_power1 := \[e1, e1:e3, e1:e2, e2:e3\]  ""
+    gdb_test "set v1_power1 := \[e1, e1:e3, e1:e2, e2:e3\]"  ""
     test_print_accept "print v1_power1" {\[e1:e3\]}
 
-    gdb_test "set v_power2 := \[e2\]  ""
+    gdb_test "set v_power2 := \[e2\]"  ""
     test_print_accept "print v_power2" {\[\]}
-    gdb_test "set v_power2 := \[1,2,3\]  ""
+    gdb_test "set v_power2 := \[1,2,3\]"  ""
     test_print_accept "print v_power2" {\[\]}
-    gdb_test "set v_power2 := \[e2, b2, b1\]  ""
+    gdb_test "set v_power2 := \[e2, b2, b1\]"  ""
     test_print_accept "print v_power2" {\[\]}
 
 # Note, that this is a numbered SET, so a1:a3 contains all elements (exept a6)
-    gdb_test "set v_power2 := \[a1:a3, a6:a4, a7:a9\]  ""
+    gdb_test "set v_power2 := \[a1:a3, a6:a4, a7:a9\]"  ""
     test_print_accept "print v_power2" {\[a6:a3\]}
-    gdb_test "set v_power2 := \[a1, a4:a6, a9\]  ""
+    gdb_test "set v_power2 := \[a1, a4:a6, a9\]"  ""
     test_print_accept "print v_power2" {\[a1, a9\]}
-    gdb_test "set v_power2 := \[a1:a2, a6, a9\]  ""
+    gdb_test "set v_power2 := \[a1:a2, a6, a9\]"  ""
     test_print_accept "print v_power2" {\[a6:a2, a9\]}
-    gdb_test "set v_power2 := \[a1, a4, a7:a8, a9:a3\]  ""
+    gdb_test "set v_power2 := \[a1, a4, a7:a8, a9:a3\]"  ""
     test_print_accept "print v_power2" {\[a1, a4, a9:a8\]}
-    gdb_test "set v_power2 := \[a1, a4:a8\]  ""
+    gdb_test "set v_power2 := \[a1, a4:a8\]"  ""
     test_print_accept "print v_power2" {\[a1, a4:a8\]}
-    gdb_test "set v_power2 := \[a8,a3,a7,a9,a5,a6\]  ""
+    gdb_test "set v_power2 := \[a8,a3,a7,a9,a5,a6\]"  ""
     test_print_accept "print v_power2" {\[a6, a5, a9, a7, a3, a8\]}
 
-    gdb_test "set v_power3 := \[b1:b2,e1\]  ""
+    gdb_test "set v_power3 := \[b1:b2,e1\]"  ""
     test_print_accept "print v_power3" {\[b1:b2\]}
-    gdb_test "set v_power3 := \[b1, b3, b6:b7\]  ""
+    gdb_test "set v_power3 := \[b1, b3, b6:b7\]"  ""
     test_print_accept "print v_power3" {\[b1, b3, b6:b7\]}
-    gdb_test "set v_power3 := \[b1, b3:b4, b7\]  ""
+    gdb_test "set v_power3 := \[b1, b3:b4, b7\]"  ""
     test_print_accept "print v_power3" {\[b1, b3:b4, b7\]}
-    gdb_test "set v_power3 := \[b1, b4:b6, b7\]  ""
+    gdb_test "set v_power3 := \[b1, b4:b6, b7\]"  ""
     test_print_accept "print v_power3" {\[b1, b4:b7\]}
-    gdb_test "set v_power3 := \[b1:b7\]  ""
+    gdb_test "set v_power3 := \[b1:b7\]"  ""
     test_print_accept "print v_power3" {\[b1:b7\]}
-    gdb_test "set v_power3 := \[b5:b7, b1\]  ""
+    gdb_test "set v_power3 := \[b5:b7, b1\]"  ""
     test_print_accept "print v_power3" {\[b1, b5:b7\]}
 
-    send_gdb "set v_power4 := \[\"b\"\] \n" ; gdb_expect -re "$gdb_prompt $"
+    gdb_test "set v_power4 := \[\"b\"\]" ""
     test_print_accept "print v_power4" {\['b':'x'\]}
-    gdb_test "set v_power4 := \[5\]  ""
+    gdb_test "set v_power4 := \[5\]"  ""
     test_print_accept "print v_power4" {\['b':'x'\]}
-    gdb_test "set v_power4 := \['c':'f','g':'h','o':'t'\] ""
+    gdb_test "set v_power4 := \['c':'f','g':'h','o':'t'\]" ""
     test_print_accept "print v_power4" {\['c':'h', 'o':'t'\]}
-    gdb_test "set v_power4 := \['a','b','c','d','e','f'\] ""
+    gdb_test "set v_power4 := \['a','b','c','d','e','f'\]" ""
     test_print_accept "print v_power4" {\['a':'f'\]}
-    gdb_test "set v_power4 := \['\^(0)':'\^(200)'\] ""
+    gdb_test "set v_power4 := \['\^(0)':'\^(200)'\]" ""
     test_print_accept "print v_power4" {\['\^\(0\)':'\^\(200\)'\]}
 
-    gdb_test "set v_power5 := \[a8\]  ""
+    gdb_test "set v_power5 := \[a8\]"  ""
     test_print_accept "print v_power5" {\[2:100\]}
-    gdb_test "set v_power5 := \[4\]  ""
+    gdb_test "set v_power5 := \[4\]"  ""
     test_print_accept "print v_power5" {\[4\]}
-    gdb_test "set v_power5 := \[3:95,9:100,10:107,200:250\] ""
+    gdb_test "set v_power5 := \[3:95,9:100,10:107,200:250\]" ""
     test_print_accept "print v_power5" {\[3:107, 200:250\]}
-    gdb_test "set v_power5 := \[2, 100:120, 350:400\]  ""
+    gdb_test "set v_power5 := \[2, 100:120, 350:400\]"  ""
     test_print_accept "print v_power5" {\[2, 100:120, 350:400\]}
-    gdb_test "set v_power5 := \[2:64,65:127,128:256,256:399,400\] ""
+    gdb_test "set v_power5 := \[2:64,65:127,128:256,256:399,400\]" ""
     test_print_accept "print v_power5" {\[2:400\]}
-    gdb_test "set v_power5 := \[3:95, 99:100, 101:107, 200:250\]  ""
+    gdb_test "set v_power5 := \[3:95, 99:100, 101:107, 200:250\]"  ""
     test_print_accept "print v_power5" {\[3:95, 99:107, 200:250\]}
 
-    gdb_test "set v_power6 := \[a8\]  ""
+    gdb_test "set v_power6 := \[a8\]"  ""
     test_print_accept "print v_power6" {\[\]}
-    gdb_test "set v_power6 := \[4\]  ""
+    gdb_test "set v_power6 := \[4\]"  ""
     test_print_accept "print v_power6" {\[4\]}
-    gdb_test "set v_power6 := \[3:95, 99:100, 101:107, 200:250\]  ""
+    gdb_test "set v_power6 := \[3:95, 99:100, 101:107, 200:250\]"  ""
     test_print_accept "print v_power6" {\[3:95, 99:107, 200:250\]}
-    gdb_test "set v_power6 := \[-111:0, 1:112, 11111:22222\]  ""
+    gdb_test "set v_power6 := \[-111:0, 1:112, 11111:22222\]"  ""
     test_print_accept "print v_power6" {\[-111:112, 11111:22222\]}
-    gdb_test "set v_power6 := \[0, 200:4000, 6666:9999\]  ""
+    gdb_test "set v_power6 := \[0, 200:4000, 6666:9999\]"  ""
     test_print_accept "print v_power6" {\[0, 200:4000, 6666:9999\]}
 
-#    gdb_test "set v_power7 := \[a8\]  ""
+#    gdb_test "set v_power7 := \[a8\]"  ""
 #    test_print_accept "print v_power7" {\[2:100\]}
-#    gdb_test "set v_power7 := \[4\]  ""
+#    gdb_test "set v_power7 := \[4\]"  ""
 #    test_print_accept "print v_power7" {\[4\]}
-#    gdb_test "set v_power7 := \[3:95, 99:100, 101:107, 200:250\] ""
+#    gdb_test "set v_power7 := \[3:95, 99:100, 101:107, 200:250\]" ""
 #    test_print_accept "print v_power7" {\[3:95, 99:107, 200:250\]}
-#    gdb_test "set v_power7 := \[0, 1000, 1000000, 10000000000\]  ""
+#    gdb_test "set v_power7 := \[0, 1000, 1000000, 10000000000\]"  ""
 #    test_print_accept "print v_power7" {\[0, 1000, 1000000, 1000000000\]}
-#    gdb_test "set v_power7 := \[-20000:100000, 111111:2222222\]  ""
+#    gdb_test "set v_power7 := \[-20000:100000, 111111:2222222\]"  ""
 #    test_print_accept "print v_power7" {\[-20000:100000, 111111:2222222\]}
-#    gdb_test "set v_power7 := \[\]  ""
+#    gdb_test "set v_power7 := \[\]"  ""
 #    test_print_accept "print v_power7" {\[3:95, 99:107, 200:250\]}
-#    gdb_test "set v_power7 := \[2:-500, -501:1, 20:370, -888:-920, 1000:2000, 1800:2500\]\  ""
+#    gdb_test "set v_power7 := \[2:-500, -501:1, 20:370, -888:-920, 1000:2000, 1800:2500\]\ " ""
 #    test_print_accept "print v_power7" {\[-920:-888, -501:2, 20:370, 1000:2500\]}
 #    test_print_accept "print SIZE(v_power7)" ""
 
diff --git a/gdb/testsuite/gdb.chill/pr-4975.exp b/gdb/testsuite/gdb.chill/pr-4975.exp
index 1836505..f59e7dc 100644
--- a/gdb/testsuite/gdb.chill/pr-4975.exp
+++ b/gdb/testsuite/gdb.chill/pr-4975.exp
@@ -54,7 +54,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     # This is needed (at least on SunOS4) to make sure the
     # the symbol table is read.
diff --git a/gdb/testsuite/gdb.chill/pr-5016.exp b/gdb/testsuite/gdb.chill/pr-5016.exp
index 24347c3..4384d8c 100644
--- a/gdb/testsuite/gdb.chill/pr-5016.exp
+++ b/gdb/testsuite/gdb.chill/pr-5016.exp
@@ -46,7 +46,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto dump
     # Linux thinks type is "_cint" (and so does sparc-sun-sunos4, alpha-dec-osf2.0)
@@ -55,7 +55,7 @@ proc do_tests {} {
     gdb_test_exact "ptype m_index" "type = RANGE (1:10)" "ptype m_index"
     gdb_test_exact "whatis a" "type = /*LOC*/ vector"
     gdb_test "ptype a" "type = /\\*LOC\\*/ ARRAY \\(1:10\\) (INT|int)"
-    gdb_test "step ""
+    gdb_test "step" ""
     gdb_test_exact "whatis i" "type = long" "whatis loop counter i"
 }
 
diff --git a/gdb/testsuite/gdb.chill/pr-5020.exp b/gdb/testsuite/gdb.chill/pr-5020.exp
index 274f1c3..1adece3 100644
--- a/gdb/testsuite/gdb.chill/pr-5020.exp
+++ b/gdb/testsuite/gdb.chill/pr-5020.exp
@@ -46,16 +46,16 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     # This is needed (at least on SunOS4) to make sure the
     # the symbol table is read.
-    gdb_test "break chillvars.ch:3 ""
-    gdb_test "delete 1 ""
+    gdb_test "break chillvars.ch:3" ""
+    gdb_test "delete 1" ""
 
-    gdb_test "set width 0 ""
-    gdb_test "set print sevenbit-strings ""
-    gdb_test "set print address off ""
+    gdb_test "set width 0" ""
+    gdb_test "set print sevenbit-strings" ""
+    gdb_test "set print address off" ""
 
     test_pr_5020
 }
@@ -71,7 +71,7 @@ proc test_pr_5020 {} {
 	{= [(10): [.l: 10, .b: TRUE], (11): [.l: 111, .b: FALSE]]}
     gdb_test_exact "print setarr" \
 	{= [(aa): [.l: 10, .b: TRUE], (bb): [.l: 111, .b: FALSE]]}
-    gdb_test "set print pretty ""
+    gdb_test "set print pretty" ""
     gdb_test_exact "print y" \
 {= [('a'): [

     .l: 10, 

diff --git a/gdb/testsuite/gdb.chill/pr-5022.exp b/gdb/testsuite/gdb.chill/pr-5022.exp
index a5f8d2b..097e386 100644
--- a/gdb/testsuite/gdb.chill/pr-5022.exp
+++ b/gdb/testsuite/gdb.chill/pr-5022.exp
@@ -46,15 +46,15 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     # This is needed (at least on SunOS4) to make sure the
     # the symbol table is read.
-    gdb_test "break gdbme.ch:3 ""
-    gdb_test "delete 1 ""
+    gdb_test "break gdbme.ch:3" ""
+    gdb_test "delete 1" ""
 
-    gdb_test "set width 0 ""
-    gdb_test "set print sevenbit-strings ""
+    gdb_test "set width 0" ""
+    gdb_test "set print sevenbit-strings" ""
 
     test_pr_5022
 }
@@ -63,7 +63,7 @@ proc test_pr_5022 {} {
     global gdb_prompt
     runto dummy_pr_5022
     gdb_test "p p" " = NULL" "print NULL pointer"
-    gdb_test "continue ""
+    gdb_test "continue" ""
     gdb_test "p p" {= PTR\(H'[0-9a-fA-F]+\)} "print non-NULL pointer"
 }
 
diff --git a/gdb/testsuite/gdb.chill/pr-5646.exp b/gdb/testsuite/gdb.chill/pr-5646.exp
index 9b9618e..958b36a 100644
--- a/gdb/testsuite/gdb.chill/pr-5646.exp
+++ b/gdb/testsuite/gdb.chill/pr-5646.exp
@@ -54,10 +54,10 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto p
-    gdb_test "next ""
+    gdb_test "next" ""
     gdb_test_exact "print xx" {= [a:b]}
 }
 
diff --git a/gdb/testsuite/gdb.chill/pr-5984.exp b/gdb/testsuite/gdb.chill/pr-5984.exp
index 1e703af..f8ea37e 100644
--- a/gdb/testsuite/gdb.chill/pr-5984.exp
+++ b/gdb/testsuite/gdb.chill/pr-5984.exp
@@ -48,7 +48,7 @@ proc do_tests {} {
 
     send_gdb "set language chill\n" ; 
 
-    gdb_test "break pr-5984.ch:6 ""
+    gdb_test "break pr-5984.ch:6" ""
     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 bbb8873..db276b8 100644
--- a/gdb/testsuite/gdb.chill/pr-6292.exp
+++ b/gdb/testsuite/gdb.chill/pr-6292.exp
@@ -48,7 +48,7 @@ proc do_tests {} {
 
     send_gdb "set language chill\n" ; 
 
-    gdb_test "break pr-6292.ch:15 ""
+    gdb_test "break pr-6292.ch:15" ""
     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'.}
diff --git a/gdb/testsuite/gdb.chill/pr-6632.exp b/gdb/testsuite/gdb.chill/pr-6632.exp
index 170eb77..03e342c 100644
--- a/gdb/testsuite/gdb.chill/pr-6632.exp
+++ b/gdb/testsuite/gdb.chill/pr-6632.exp
@@ -55,7 +55,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto p
     gdb_test "whatis x" {type = m_dummy_range}
diff --git a/gdb/testsuite/gdb.chill/pr-8134.exp b/gdb/testsuite/gdb.chill/pr-8134.exp
index 4a73744..5bbd66c 100644
--- a/gdb/testsuite/gdb.chill/pr-8134.exp
+++ b/gdb/testsuite/gdb.chill/pr-8134.exp
@@ -55,7 +55,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto p1
     gdb_test "print first" "= 1"
diff --git a/gdb/testsuite/gdb.chill/pr-8136.exp b/gdb/testsuite/gdb.chill/pr-8136.exp
index ff806e4..7bf360c 100644
--- a/gdb/testsuite/gdb.chill/pr-8136.exp
+++ b/gdb/testsuite/gdb.chill/pr-8136.exp
@@ -54,7 +54,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto p1
     gdb_test "print ps" {= \[e3, e7:e9\]}
diff --git a/gdb/testsuite/gdb.chill/pr-8405.exp b/gdb/testsuite/gdb.chill/pr-8405.exp
index 970bd9d..dff230e 100644
--- a/gdb/testsuite/gdb.chill/pr-8405.exp
+++ b/gdb/testsuite/gdb.chill/pr-8405.exp
@@ -35,8 +35,8 @@ proc do_tests {} {
     gdb_start
     gdb_load $binfile
 
-    gdb_test "set language chill ""
-    gdb_test "set var \$i:=xx ""
+    gdb_test "set language chill" ""
+    gdb_test "set var \$i:=xx" ""
     gdb_test "print \$i" {= \[.c: "", .b: B'00000000', .boo: FALSE\]}
 }
 
diff --git a/gdb/testsuite/gdb.chill/pr-8742.exp b/gdb/testsuite/gdb.chill/pr-8742.exp
index 7ae29e2..ee49c28 100644
--- a/gdb/testsuite/gdb.chill/pr-8742.exp
+++ b/gdb/testsuite/gdb.chill/pr-8742.exp
@@ -46,7 +46,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto dummy
 
diff --git a/gdb/testsuite/gdb.chill/pr-8894.exp b/gdb/testsuite/gdb.chill/pr-8894.exp
index 18a94a1..adef6f6 100644
--- a/gdb/testsuite/gdb.chill/pr-8894.exp
+++ b/gdb/testsuite/gdb.chill/pr-8894.exp
@@ -52,7 +52,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     gdb_test "print size(m_byte)" { = 2}
     gdb_test "print size(m_struct)" { = 6}
diff --git a/gdb/testsuite/gdb.chill/pr-9095.exp b/gdb/testsuite/gdb.chill/pr-9095.exp
index 056624b..4c5ce97 100644
--- a/gdb/testsuite/gdb.chill/pr-9095.exp
+++ b/gdb/testsuite/gdb.chill/pr-9095.exp
@@ -35,7 +35,7 @@ proc do_tests {} {
     gdb_start
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
     runto pr-9095.ch:12
     gdb_test {p v_arr2(5)->.p(5)} "reference value used as function" \
 	"bad call using pointer"
diff --git a/gdb/testsuite/gdb.chill/result.exp b/gdb/testsuite/gdb.chill/result.exp
index 9708db7..64ca335 100644
--- a/gdb/testsuite/gdb.chill/result.exp
+++ b/gdb/testsuite/gdb.chill/result.exp
@@ -46,31 +46,31 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
-    gdb_test "set width 0 ""
-    gdb_test "set print sevenbit-strings ""
-    gdb_test "set print address off ""
+    gdb_test "set width 0" ""
+    gdb_test "set print sevenbit-strings" ""
+    gdb_test "set print address off" ""
 
     # simple function
     runto simple_func
-    gdb_test "step 2 ""
+    gdb_test "step 2" ""
     gdb_test "print j" "= 5"
     gdb_test "p RESULT" "= 10"
-    gdb_test "continue ""
+    gdb_test "continue" ""
     gdb_test "print i" "= 7"
-    gdb_test "step 4 ""
-    gdb_test "set RESULT := 50 ""
-    gdb_test "finish ""
-    gdb_test "step ""
+    gdb_test "step 4" ""
+    gdb_test "set RESULT := 50" ""
+    gdb_test "finish" ""
+    gdb_test "step" ""
     gdb_test "print i" "= 50"
 
     # returning a structure
     runto ret_struct
-    gdb_test "step 2 ""
+    gdb_test "step 2" ""
     gdb_test "p result" {\[.l: 33, .b: FALSE\]}
-    gdb_test "set var result := \[383, TRUE\] ""
-    gdb_test "finish ""
+    gdb_test "set var result := \[383, TRUE\]" ""
+    gdb_test "finish" ""
     gdb_test "p v_struct" {\[.l: 383, .b: TRUE\]}
 }
 
diff --git a/gdb/testsuite/gdb.chill/string.exp b/gdb/testsuite/gdb.chill/string.exp
index 2f5a4b1..dabd7e9 100644
--- a/gdb/testsuite/gdb.chill/string.exp
+++ b/gdb/testsuite/gdb.chill/string.exp
@@ -44,7 +44,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     # These tests based on Cygnus PR chill/5696.
     runto string.ch:22
diff --git a/gdb/testsuite/gdb.chill/tuples.exp b/gdb/testsuite/gdb.chill/tuples.exp
index c75f236..fbfa9ed 100644
--- a/gdb/testsuite/gdb.chill/tuples.exp
+++ b/gdb/testsuite/gdb.chill/tuples.exp
@@ -46,7 +46,7 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language chill ""
+    gdb_test "set language chill" ""
 
     runto tuples.ch:40
 
@@ -109,8 +109,8 @@ proc do_tests {} {
    gdb_test_exact "print vstr.ch1" {= 'x'} "vstr.ch1 after assignment"
 
 #   These tests are from Cygnus PR chill/5024:
-    gdb_test "break printdow ""
-    gdb_test "continue ""
+    gdb_test "break printdow" ""
+    gdb_test "continue" ""
     gdb_test_exact "set var w:= dow\[monday\]" {}
     gdb_test "print w" " = \\\[monday\\\]" \
 	"print bitstring after assignment"