2010-05-25 Michael Snyder <msnyder@vmware.com>

	* gdb.base/maint.exp: Replace send_gdb with gdb_test.
	* gdb.base/miscexprs.exp: Replace send_gdb with gdb_test.
	* gdb.base/nodebug.exp: Replace send_gdb with gdb_test.
	* gdb.base/pointers.exp: Replace send_gdb with gdb_test.
	* gdb.base/ptype.exp: Replace send_gdb with gdb_test.

1 files changed, 72 insertions, 216 deletions

diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index b4df1b1..b22b7f4 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -69,239 +69,95 @@ if ![runto_main] then {
     continue
 }
 
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-		-re ".*main.*$gdb_prompt $" {
-		    pass "up from marker1"
-		}
-                -re ".*$gdb_prompt $" {
-		    fail "up from marker1"
-		}
-                timeout { fail "up from marker1 (timeout)" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
+gdb_test "break marker1" "" ""
+
+gdb_test "cont" \
+    "Break.* marker1 \\(\\) at .*:$decimal.*" \
+    "continue to marker1"
+
+gdb_test "up" " main .*" "up from marker1"
 
 global hex
 
-send_gdb "print &ibig.i\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &ibig.i\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &ibig.i\[0\]" }
-    timeout           { fail "(timeout) print value of &ibig.i\[0\]" }
-  }
-
-send_gdb "print &cbig.c\[0\]\n"
-gdb_expect {
+gdb_test "print &ibig.i\[0\]" " = \\(int \\*\\) $hex" \
+    "print value of &ibig.i\[0\]"
+
+gdb_test_multiple "print &cbig.c\[0\]" "print value of &cbig.c\[0\]" {
     -re ".\[0-9\]* = $hex \"\".*$gdb_prompt $" {
         pass "print value of &cbig.c\[0\]"
-      }
+    }
     -re ".\[0-9\]* = $hex \"*\".*$gdb_prompt $" {
         pass "print value of &cbig.c\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &cbig.c\[0\]" }
-    timeout           { fail "(timeout) print value of &cbig.c\[0\]" }
-  }
-
-send_gdb "print &fbig.f\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(float \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &fbig.f\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &fbig.f\[0\]" }
-    timeout           { fail "(timeout) print value of &fbig.f\[0\]" }
-  }
-
-send_gdb "print &dbig.d\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(double \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &dbig.d\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &dbig.d\[0\]" }
-    timeout           { fail "(timeout) print value of &dbig.d\[0\]" }
-  }
-
-send_gdb "print &sbig.s\[0\]\n"
-gdb_expect {
+    }
+}
+
+gdb_test "print &fbig.f\[0\]" " = \\(float \\*\\) $hex" \
+    "print value of &fbig.f\[0\]"
+
+gdb_test "print &dbig.d\[0\]" " = \\(double \\*\\) $hex" \
+    "print value of &dbig.d\[0\]"
+
+gdb_test_multiple "print &sbig.s\[0\]" "print value of &sbig.s\[0\]" {
     -re ".\[0-9\]* = \\(short \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &sbig.s\[0\]"
     }
     -re ".\[0-9\]* = \\(short int \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &sbig.s\[0\]"
     }
-    -re ".*$gdb_prompt $" { fail "print value of &sbig.s\[0\]" }
-    timeout           { fail "(timeout) print value of &sbig.s\[0\]" }
-  }
+}
 
-send_gdb "print &lbig.l\[0\]\n"
-gdb_expect {
+gdb_test_multiple "print &lbig.l\[0\]" "print value of &lbig.l\[0\]" {
     -re ".\[0-9\]* = \\(long \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &lbig.l\[0\]"
     }
     -re ".\[0-9\]* = \\(long int \\*\\) $hex.*$gdb_prompt $" {
         pass "print value of &lbig.l\[0\]"
     }
-    -re ".*$gdb_prompt $" { fail "print value of &lbig.l\[0\]" }
-    timeout           { fail "(timeout) print value of &lbig.l\[0\]" }
-  }
-
-
-send_gdb "print ibig.i\[100\] | 1\n"
-gdb_expect {
-    -re ".\[0-9\]* = 5.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] | 1"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] | 1" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] | 1" }
-  }
-
-
-send_gdb "print sbig.s\[90\] & 127\n"
-gdb_expect {
-    -re ".\[0-9\]* = 127.*$gdb_prompt $" {
-        pass "print value of sbig.s\[90\] & 127"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] & 127" }
-    timeout           { fail "(timeout) print value of sbig.s\[90\] & 127" }
-  }
-
-send_gdb "print !ibig.i\[100\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-send_gdb "print !sbig.s\[90\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !sbig.s\[90\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\]" }
-    timeout           { fail "(timeout) print value of !sbig.s\[90\]" }
-  }
-
-
-send_gdb "print !fbig.f\[100\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-send_gdb "print !dbig.d\[202\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-
-
-send_gdb "print sbig.s\[90\] * 10\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2550.*$gdb_prompt $" {
-        pass "print value of !sbig.s\[90\] * 10"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\] * 10" }
-    timeout           { fail "(timeout) print value of !sbig.s\[90\] * 10" }
-  }
-
-send_gdb "print ibig.i\[100\] * sbig.s\[90\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1275.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] * sbig.s\[90\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] * sbig.s\[90\]" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] * sbig.s\[90\]" }
-  }
-
-send_gdb "print fbig.f\[100\] * dbig.d\[202\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 119.99\[0-9\]*.*$gdb_prompt $" {
-        pass "print value of fbig.f\[100\] * dbig.d\[202\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of fbig.f\[100\] * dbig.d\[202\]" }
-    timeout           { fail "(timeout) print value of fbig.f\[100\] * dbig.d\[202\]" }
-  }
-
-send_gdb "print !(sbig.s\[90\] * 2)\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !(sbig.s\[90\] * 2)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !(sbig.s\[90\] * 2)" }
-    timeout           { fail "(timeout) print value of !(sbig.s\[90\] * 2)" }
-  }
-
-
-send_gdb "print sizeof(sbig)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 800.*$gdb_prompt $" {
-        pass "print value of sizeof(sbig)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(sbig)" }
-    timeout           { fail "(timeout) print value of sizeof(sbig)" }
-  }
-
-
-send_gdb "print sizeof(cbig)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 100.*$gdb_prompt $" {
-        pass "print value of sizeof(cbig)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(cbig)" }
-    timeout           { fail "(timeout) print value of sizeof(cbig)" }
-  }
-
-
-send_gdb "print sizeof(lbig)/sizeof(long)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 900.*$gdb_prompt $" {
-        pass "print value of sizeof(lbig)/sizeof(long)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(lbig)/sizeof(long)" }
-    timeout     { fail "(timeout) print value of sizeof(lbig)/sizeof(long)" }
-  }
-
-send_gdb "print ibig.i\[100\] << 2\n"
-gdb_expect {
-    -re ".\[0-9\]* = 20.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] << 2"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] << 2" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] << 2" }
-  }
-
-send_gdb "print sbig.s\[90\] >> 4\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15.*$gdb_prompt $" {
-        pass "print value of sbig.s\[90\] >> 4"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] >> 4" }
-    timeout           { fail "(timeout) print value of sbig.s\[90\] >> 4" }
-  }
-
-send_gdb "print lbig.l\[333\] >> 6\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15624999.*$gdb_prompt $" {
-        pass "print value of lbig.l\[333\] >> 6"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of lbig.l\[333\] >> 6" }
-    timeout           { fail "(timeout) print value of lbig.l\[333\] >> 6" }
-  }
+}
+
+gdb_test "print ibig.i\[100\] | 1" " = 5" \
+    "print value of ibig.i\[100\] | 1"
+
+gdb_test "print sbig.s\[90\] & 127" " = 127" \
+    "print value of sbig.s\[90\] & 127"
+
+gdb_test "print !ibig.i\[100\]" " = $false" \
+    "print value of !ibig.i\[100\]"
+
+gdb_test "print !sbig.s\[90\]" " = $false" \
+    "print value of !sbig.s\[90\]"
+
+gdb_test "print !fbig.f\[100\]" " = $false" \
+    "print value of !ibig.i\[100\]"
+
+gdb_test "print !dbig.d\[202\]" " = $false" \
+    "print value of !ibig.i\[100\]"
+
+gdb_test "print sbig.s\[90\] * 10" " = 2550" \
+    "print value of !sbig.s\[90\] * 10"
+
+gdb_test "print ibig.i\[100\] * sbig.s\[90\]" " = 1275" \
+    "print value of ibig.i\[100\] * sbig.s\[90\]"
+
+gdb_test "print fbig.f\[100\] * dbig.d\[202\]" " = 119.99\[0-9\]*" \
+    "print value of fbig.f\[100\] * dbig.d\[202\]"
+
+gdb_test "print !(sbig.s\[90\] * 2)" " = $false" \
+    "print value of !(sbig.s\[90\] * 2)"
+
+gdb_test "print sizeof(sbig)" " = 800" "print value of sizeof sbig"
+
+gdb_test "print sizeof(cbig)" " = 100" "print value of sizeof cbig"
+
+gdb_test "print sizeof(lbig)/sizeof(long)" " = 900" \
+    "print value of sizeof lbig / sizeof long"
+
+gdb_test "print ibig.i\[100\] << 2" " = 20" \
+    "print value of ibig.i\[100\] << 2"
+
+gdb_test "print sbig.s\[90\] >> 4" " = 15" \
+    "print value of sbig.s\[90\] >> 4"
+
+gdb_test "print lbig.l\[333\] >> 6" " = 15624999" \
+    "print value of lbig.l\[333\] >> 6"
+