* callch.exp: Add mips*-sgi-irix* xfail for

	"call king(a, otto[[10, 15], [20, 25]])".
	* pr-8742.exp: Add mips*-sgi-irix* xfails for
	"pass int powerset tuple"
	"pass set powerset tuple"
	"pass modeless int powerset tuple" and
	"pass modeless set powerset tuple".
	* tuples.exp: Add sparc-*-solaris* and sparc-*-sunos*
	xfails for several "set var" commands that are failing.
	Convert most of the set commands into gdb_test_exact
	commands.

4 files changed, 52 insertions, 41 deletions

diff --git a/gdb/testsuite/gdb.chill/ChangeLog b/gdb/testsuite/gdb.chill/ChangeLog
index 23c9263..81f8022 100644
--- a/gdb/testsuite/gdb.chill/ChangeLog
+++ b/gdb/testsuite/gdb.chill/ChangeLog
@@ -1,3 +1,17 @@
+Mon Nov 11 10:27:32 1996  Fred Fish  <fnf@cygnus.com>
+
+	* callch.exp: Add mips*-sgi-irix* xfail for
+	"call king(a, otto[[10, 15], [20, 25]])".
+	* pr-8742.exp: Add mips*-sgi-irix* xfails for
+	"pass int powerset tuple"
+	"pass set powerset tuple"
+	"pass modeless int powerset tuple" and
+	"pass modeless set powerset tuple".
+	* tuples.exp: Add sparc-*-solaris* and sparc-*-sunos*
+	xfails for several "set var" commands that are failing.
+	Convert most of the set commands into gdb_test_exact
+	commands.
+
 Fri Oct 11 16:48:56 1996  Fred Fish  <fnf@cygnus.com>
 
 	* expstruct.exp (objfile2): Set and use, like other chill tests.
diff --git a/gdb/testsuite/gdb.chill/callch.exp b/gdb/testsuite/gdb.chill/callch.exp
index 36d4f11..2a5007b 100644
--- a/gdb/testsuite/gdb.chill/callch.exp
+++ b/gdb/testsuite/gdb.chill/callch.exp
@@ -57,6 +57,8 @@ proc do_tests {} {
     gdb_test_exact "call klaus(10, 20, 30)" {here's klaus calling.}
     gdb_test "print a" { = \[\(FALSE:TRUE\): \[\(FALSE:TRUE\): 1\]\]}\
 	"print a before king"
+    # Current gdb prints 255 for the results that are expected to be -1.
+    setup_xfail "mips*-sgi-irix*"
     gdb_test {call king(a, otto[[10, 15], [20, 25]])} "x\\(FALSE, FALSE\\) = 10.*p\\(FALSE, FALSE\\) = -1.*x\\(FALSE, TRUE\\) = 15.*p\\(FALSE, TRUE\\) = -1.*x\\(TRUE, FALSE\\) = 20.*p\\(TRUE, FALSE\\) = -1.*x\\(TRUE, TRUE\\) = 25.*p\\(TRUE, TRUE\\) = -1.*"
     gdb_test "print a" { = \[\(FALSE:TRUE\): \[\(FALSE:TRUE\): -1\]\]}\
 	"print a after king"
diff --git a/gdb/testsuite/gdb.chill/pr-8742.exp b/gdb/testsuite/gdb.chill/pr-8742.exp
index 7b868e7..9ffe82c 100644
--- a/gdb/testsuite/gdb.chill/pr-8742.exp
+++ b/gdb/testsuite/gdb.chill/pr-8742.exp
@@ -50,11 +50,14 @@ proc do_tests {} {
 
     runto dummy
 
-    setup_xfail "m68*-*-hpux*"
+    # Haven't investigated why these fail on mips-sgi-irix*
+    setup_xfail "m68*-*-hpux*" "mips*-sgi-irix*"
     gdb_test {call x(p [1, 3, 5])} "1 3 5 " "pass int powerset tuple"
+    setup_xfail "mips*-sgi-irix*"
     gdb_test {call y(s_ps [sc])} "sc " "pass set powerset tuple"
-    setup_xfail "m68*-*-hpux*"
+    setup_xfail "m68*-*-hpux*" "mips*-sgi-irix*"
     gdb_test {call x([1, 3, 5])} "1 3 5 " "pass modeless int powerset tuple"
+    setup_xfail "mips*-sgi-irix*"
     gdb_test {call y([sc])} "sc " "pass modeless set powerset tuple"
 }
 
diff --git a/gdb/testsuite/gdb.chill/tuples.exp b/gdb/testsuite/gdb.chill/tuples.exp
index 2c92596..2996f97 100644
--- a/gdb/testsuite/gdb.chill/tuples.exp
+++ b/gdb/testsuite/gdb.chill/tuples.exp
@@ -51,22 +51,22 @@ proc do_tests {} {
     runto tuples.ch:40
 
     gdb_test_exact "print v_arri" {= [(1): -1, (2): -2, (3): -3, (4): -4, (5): -5]}
-    send "set v_arri := \[ 33, 44, 55, 66, 77 \]\n" ;  expect -re "$prompt $"
+    gdb_test_exact "set v_arri := \[ 33, 44, 55, 66, 77 \]" {}
     gdb_test_exact "print v_arri" {= [(1): 33, (2): 44, (3): 55, (4): 66, (5): 77]} "after assignment 1 to v_arri"
-    send "set v_arri := \[-33, -44, -55, -66, -77\]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_arri := \[-33, -44, -55, -66, -77\]" {}
     gdb_test_exact "print v_arri" {= [(1): -33, (2): -44, (3): -55, (4): -66, (5): -77]} {after assignment 2 to v_arri}
 
     gdb_test_exact "print v_arrui" {= [(1): 1, (2): 2, (3): 3, (4): 4, (5): 5]}
-    send "set v_arrui := \[ 11, 11, 11, 11, 11 \]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_arrui := \[ 11, 11, 11, 11, 11 \]" {}
     gdb_test_exact "print v_arrui" {= [(1:5): 11]} "after assignment to v_arrui"
 
     gdb_test_exact "print v_arrb" {= [(1): -3, (2): -4, (3): -5, (4): -6, (5): -7]}
 
-    send "set v_arrb := \[ -9, -8, -7, -6, -5 \]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_arrb := \[ -9, -8, -7, -6, -5 \]" {}
     gdb_test_exact "print v_arrb" {= [(1): -9, (2): -8, (3): -7, (4): -6, (5): -5]} "after assignment to v_arrb"
 
     gdb_test_exact "print v_arrub" {= [(1): 3, (2): 4, (3): 5, (4): 6, (5): 7]}
-    send "set v_arrub := \[ 77, 77, 77, 77, 77 \]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_arrub := \[ 77, 77, 77, 77, 77 \]" {}
     gdb_test_exact "print v_arrub" {= [(1:5): 77]} "v_arrub after assignment"
 
     gdb_test_exact "print j" {= 4}
@@ -74,11 +74,11 @@ proc do_tests {} {
     gdb_test_exact "print j := r1(3)" {= 3}
 
     gdb_test_exact "print v_arrc" {= [(1): '1', (2): '2', (3): '3', (4): '4', (5): '5']}
-    send "set v_arrc := \[ 'a', 'b', 'c', 'd', 'e' \]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_arrc := \[ 'a', 'b', 'c', 'd', 'e' \]" {}
     gdb_test_exact "print v_arrc" {= [(1): 'a', (2): 'b', (3): 'c', (4): 'd', (5): 'e']} "v_arrc after assignment"
 
     gdb_test_exact "print v_ps" {= [1, 3, 5]}
-    send "set v_ps := \[ 2, 4 \]\n";  expect -re "$prompt $"
+    gdb_test_exact "set v_ps := \[ 2, 4 \]" {}
     gdb_test_exact "print v_ps" {= [2, 4]} {v_ps after assignment}
     gdb_test_exact "print v_ps :=  \[\]" {= []} {assign [] to v_ps}
 
@@ -86,81 +86,73 @@ proc do_tests {} {
     gdb_test_exact "print m_arrub\[45, 46, 47, 48, 49\]" {= [(1): 45, (2): 46, (3): 47, (4): 48, (5): 49]}
 
    gdb_test_exact "print v_cv" {= "foo"}
-   send "set v_cv := \"foo-bar\"\n";  expect -re "$prompt $"
+   gdb_test_exact "set v_cv := \"foo-bar\"" {}
    gdb_test_exact "print v_cv" {= "foo-bar"} "v_cv after assignment"
-   send "print v_cv(3) := ' '\n";  expect -re "$prompt $"
+   gdb_test_exact "set v_cv(3) := ' '" {}
    gdb_test_exact "print v_cv" {= "foo bar"} "v_cv after element assignment"
 
    gdb_test_exact "print v_arrbool" {= [(1): TRUE, (2): FALSE, (3): TRUE, (4): FALSE, (5): TRUE]}
-   send "set v_arrbool := \[ false, false, false, false, false \]\n"
-   expect -re "$prompt $"
+   gdb_test_exact "set v_arrbool := \[ false, false, false, false, false \]" {}
    gdb_test_exact "print v_arrbool" {= [(1:5): FALSE]} "v_arrbool after assignment 1"
-   send "set v_arrbool := \[true, true, true, true, true\]\n"
-   expect -re "$prompt $"
+   gdb_test_exact "set v_arrbool := \[true, true, true, true, true\]" {}
    gdb_test_exact "print v_arrbool" {= [(1:5): TRUE]} "v_arrbool after assignment 2"
-   send "set v_arrbool(3) := false\n";  expect -re "$prompt $"
+   gdb_test_exact "set v_arrbool(3) := false" {}
    gdb_test_exact "print v_arrbool" {= [(1:2): TRUE, (3): FALSE, (4:5): TRUE]} "v_arrbool after element assignment"
 
-   send "set v_arrbool(1 up 2) := \[ false, true \]\n"
-   expect -re "$prompt $"
+   gdb_test_exact "set v_arrbool(1 up 2) := \[ false, true \]" {}
    gdb_test_exact "print v_arrbool" {= [(1): FALSE, (2): TRUE, (3): FALSE, (4:5): TRUE]} "v_arrbool after slice assignment 1"
-   send "set v_arrbool(3 : 5) := \[ true, true, false \]\n"
-   expect -re "$prompt $"
+   gdb_test_exact "set v_arrbool(3 : 5) := \[ true, true, false \]" {}
    gdb_test_exact "print v_arrbool" {= [(1): FALSE, (2:4): TRUE, (5): FALSE]} "v_arrbool after slice assignment 2"
 
-   send "set vstr := \[ .a: 2+3, .b: 12, .ch1: 'x' \]\n"
-   expect -re "$prompt $"
+   gdb_test_exact "set vstr := \[ .a: 2+3, .b: 12, .ch1: 'x' \]" {}
    gdb_test_exact "print vstr.a" {= 5} "vstr.a after assignment"
    gdb_test_exact "print vstr.ch1" {= 'x'} "vstr.ch1 after assignment"
 
 #   These tests are from Cygnus PR chill/5024:
     send "break printdow\n" ; expect -re "$prompt $"
     send "continue\n" ; expect -re "$prompt $"
-    send "set var w:= dow\[monday\]\n" ; expect -re "$prompt $"
+    gdb_test_exact "set var w:= dow\[monday\]" {}
     gdb_test "print w" " = \\\[monday\\\]" \
 	"print bitstring after assignment"
-    send "set var w:=\[\]\n" ; expect -re "$prompt $"
+    gdb_test_exact "set var w:=\[\]" {}
     gdb_test "print w" " = \\\[\\\]" \
 	"print bitstring after assignment of \[\]"
 
 #   These tests are from Cygnus PR chill/8643:
     runto tuples.ch:40
-    send "set var vs1 := \[ \"foo\", 41, \[ b \] \]\n" ; expect -re "$prompt $"
+    gdb_test_exact "set var vs1 := \[ \"foo\", 41, \[ b \] \]"  {}
     gdb_test_exact "print vs1" { = [.str: "foo", .i: 41, .ps: [b]]} \
 	"print vs1 after tuple assign 1"
-    send "set var vs1 := \[ \"bar\", 42, m_ps\[ a \] \]\n"
-    expect -re "$prompt $"
-    setup_xfail "i*86-*-linux*" "m68*-*-hpux*"
+    setup_xfail "sparc-*-solaris*" "sparc-*-sunos*"
+    gdb_test_exact "set var vs1 := \[ \"bar\", 42, m_ps\[ a \] \]" {}
+    setup_xfail "i*86-*-linux*" "sparc-*-solaris*" "sparc-*-sunos*"
     gdb_test_exact "print vs1" { = [.str: "bar", .i: 42, .ps: [a]]} \
 	"print vs1 after tuple assign 2"
 
-    send "set var \$i := m_s1\[\"foo\", 42, \[a \]\]\n"
-    expect -re "$prompt $"
+    gdb_test_exact "set var \$i := m_s1\[\"foo\", 42, \[a \]\]" {}
     gdb_test_exact {print $i} { = [.str: "foo", .i: 42, .ps: [a]]} \
 	"print \$i after tuple assign 1"
-    send "set var \$i := m_s1\[\"foo\", 44, m_ps\[a \]\]\n"
-    expect -re "$prompt $"
-    setup_xfail "i*86-*-linux*" "m68*-*-hpux*"
+    setup_xfail "sparc-*-solaris*" "sparc-*-sunos*"
+    gdb_test_exact "set var \$i := m_s1\[\"foo\", 44, m_ps\[a \]\]" {}
+    setup_xfail "i*86-*-linux*" "sparc-*-solaris*" "sparc-*-sunos*"
     gdb_test_exact {print $i} { = [.str: "foo", .i: 44, .ps: [a]]} \
 	"print \$i after tuple assign 2"
 
-    send "set var vs2 := \[ 10, \[ \"foo\" , 42, \[ b \] \] \]\n"
-    expect -re "$prompt $"
+    gdb_test_exact "set var vs2 := \[ 10, \[ \"foo\" , 42, \[ b \] \] \]" {}
     gdb_test_exact "print vs2" \
 	{ = [.i: 10, .s: [.str: "foo", .i: 42, .ps: [b]]]} \
 	"print vs2 after tuple assign 1"
-    send "set var vs2 := \[ 10+3, m_s1\[ \"foo\" , 42, m_ps\[ b \] \] \]\n"
-    expect -re "$prompt $"
-    setup_xfail "i*86-*-linux*" "m68*-*-hpux*"
+    setup_xfail "sparc-*-solaris*" "sparc-*-sunos*"
+    gdb_test_exact "set var vs2 := \[ 10+3, m_s1\[ \"foo\" , 42, m_ps\[ b \] \] \]" {}
+    setup_xfail "i*86-*-linux*" "sparc-*-solaris*" "sparc-*-sunos*"
     gdb_test_exact "print vs2" \
 	{ = [.i: 13, .s: [.str: "foo", .i: 42, .ps: [b]]]} \
 	"print vs2 after tuple assign 2"
 
-    send "set var vs3 := \[ 33, \[ -1, -2, -3 \] \]\n" ; expect -re "$prompt $"
+    gdb_test_exact "set var vs3 := \[ 33, \[ -1, -2, -3 \] \]" {}
     gdb_test_exact "print vs3" {[.i: 33, .a: [(1): -1, (2): -2, (3): -3]]} \
 	"print vs3 after tuple assign"
-    send "set var \$k := m_s3\[ 33, m_arr\[ 4, 3, 2 \] \]\n"
-    expect -re "$prompt $"
+    gdb_test_exact "set var \$k := m_s3\[ 33, m_arr\[ 4, 3, 2 \] \]" {}
     gdb_test_exact {print $k} { = [.i: 33, .a: [(1): 4, (2): 3, (3): 2]]} \
 	"print \$k after tuple assign"