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

	* gdb.ada/formatted_ref.exp: Replace send_gdb with gdb_test.

	* gdb.asm/asm-source.exp: Replace send_gdb with gdb_test.

	* gdb.base/a2-run.exp: Replace send_gdb with gdb_test.
	* gdb.base/all-bin.exp: Replace send_gdb with gdb_test.
	* gdb.base/annota1.exp: Replace send_gdb with gdb_test.
	* gdb.base/annota3.exp: Replace send_gdb with gdb_test.
	* gdb.base/assign.exp: Replace send_gdb with gdb_test.
	* gdb.base/attach.exp: Replace send_gdb with gdb_test.
	* gdb.base/bitfields.exp: Replace send_gdb with gdb_test.
	* gdb.base/bitfields2.exp: Replace send_gdb with gdb_test.
	* gdb.base/bitops.exp: Replace send_gdb with gdb_test.

1 files changed, 147 insertions, 380 deletions

diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index 4eda7d6..6b9d2b4 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -57,385 +57,152 @@ if ![runto_main] then {
 
 gdb_test "next" "return 0;" "continuing after dummy()"
 
-send_gdb "print v_int=57\n"
-gdb_expect {
-    -re ".*57.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*57.*$gdb_prompt $" {
-                pass "v_int=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int=57" }
-            timeout           { fail "(timeout) v_int=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int=57" }
-    timeout           { fail "(timeout) v_int=57" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-send_gdb "print v_int+=57\n"
-gdb_expect {
-    -re ".*63.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*63.*$gdb_prompt $" {
-                pass "v_int+=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=57" }
-            timeout           { fail "(timeout) v_int+=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=57" }
-    timeout           { fail "(timeout) v_int+=57" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (2)"
-
-send_gdb "print v_int-=57\n"
-gdb_expect {
-    -re ".*-51.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*-51.*$gdb_prompt $" {
-                pass "v_int-=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int-=57" }
-            timeout           { fail "(timeout) v_int-=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int-=57" }
-    timeout           { fail "(timeout) v_int-=57" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (3)"
-
-send_gdb "print v_int*=5\n"
-gdb_expect {
-    -re ".*30.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*30.*$gdb_prompt $" {
-                pass "v_int*=5"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int*=5" }
-            timeout           { fail "(timeout) v_int*=5" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int*=5" }
-    timeout           { fail "(timeout) v_int*=5" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (4)"
-
-send_gdb "print v_int/=4\n"
-gdb_expect {
-    -re ".*1.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*1.*$gdb_prompt $" {
-                pass "v_int/=4"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int/=4" }
-            timeout           { fail "(timeout) v_int/=4" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int/=4" }
-    timeout           { fail "(timeout) v_int/=4" }    
-  }
-
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (5)"
-
-send_gdb "print v_int%=4\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*2.*$gdb_prompt $" {
-                pass "v_int%=4"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int%=4" }
-            timeout           { fail "(timeout) v_int%=4" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int%=4" }
-    timeout           { fail "(timeout) v_int%=4" }    
-  }
-
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (6)"
-
-
-
-send_gdb "print v_int+=v_char\n"
-gdb_expect {
-    -re ".*71.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*71.*$gdb_prompt $" {
-                pass "v_int+=char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_char" }
-            timeout           { fail "(timeout) v_int+=v_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_char" }
-    timeout           { fail "(timeout) v_int+=v_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (7)"
-
-
-
-send_gdb "print v_int+=v_signed_char\n"
-gdb_expect {
-    -re ".*72.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*72.*$gdb_prompt $" {
-                pass "v_int+=signed_char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_char" }
-            timeout           { fail "(timeout) v_int+=v_signed_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_char" }
-    timeout           { fail "(timeout) v_int+=v_signed_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (8)"
-
-
-
-send_gdb "print v_int+=v_unsigned_char\n"
-gdb_expect {
-    -re ".*73.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*73.*$gdb_prompt $" {
-                pass "v_int+=unsigned_char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_char" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_char" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (9)"
-
-
-
-send_gdb "print v_int+=v_short\n"
-gdb_expect {
-    -re ".*9.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*9.*$gdb_prompt $" {
-                pass "v_int+=short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_short" }
-            timeout           { fail "(timeout) v_int+=v_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_short" }
-    timeout           { fail "(timeout) v_int+=v_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (10)"
-
-
-
-send_gdb "print v_int+=v_signed_short\n"
-gdb_expect {
-    -re ".*10.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*10.*$gdb_prompt $" {
-                pass "v_int+=signed_short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_short" }
-            timeout           { fail "(timeout) v_int+=v_signed_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_short" }
-    timeout           { fail "(timeout) v_int+=v_signed_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (11)"
-
-
-
-send_gdb "print v_int+=v_unsigned_short\n"
-gdb_expect {
-    -re ".*11.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*11.*$gdb_prompt $" {
-                pass "v_int=+unsigned_short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_short" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_short" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (12)"
-
-
-
-send_gdb "print v_int+=v_signed_int\n"
-gdb_expect {
-    -re ".*13.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*13.*$gdb_prompt $" {
-                pass "v_int+=signed_int"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_int" }
-            timeout           { fail "(timeout) v_int+=v_signed_int" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_int" }
-    timeout           { fail "(timeout) v_int+=v_signed_int" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (13)"
-
-
-
-send_gdb "print v_int+=v_unsigned_int\n"
-gdb_expect {
-    -re ".*14.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*14.*$gdb_prompt $" {
-                pass "v_int+=unsigned_int"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_int" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_int" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_int" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_int" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (14)"
-
-
-
-send_gdb "print v_int+=v_long\n"
-gdb_expect {
-    -re ".*15.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*15.*$gdb_prompt $" {
-                pass "v_int+=long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_long" }
-            timeout           { fail "(timeout) v_int+=v_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_long" }
-    timeout           { fail "(timeout) v_int+=v_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (15)"
-
-
-
-send_gdb "print v_int+=v_signed_long\n"
-gdb_expect {
-    -re ".*16.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*16.*$gdb_prompt $" {
-                pass "v_int+=signed_long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_long" }
-            timeout           { fail "(timeout) v_int+=v_signed_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_long" }
-    timeout           { fail "(timeout) v_int+=v_signed_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (16)"
-
-
-send_gdb "print v_int+=v_unsigned_long\n"
-gdb_expect {
-    -re ".*17.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*17.*$gdb_prompt $" {
-                pass "v_int+=unsigned_long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_long" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_long" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (17)"
-
-
-send_gdb "print v_int+=v_float\n"
-gdb_expect {
-    -re ".*106\r\n$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*106\r\n$gdb_prompt $" {
-                pass "v_int+=v_float"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_float" }
-            timeout           { fail "(timeout) v_int+=v_float" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_float" }
-    timeout           { fail "(timeout) v_int+=v_float" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6 (18)"
-
-
-send_gdb "print v_int+=v_double\n"
-gdb_expect {
-    -re ".*206\r\n$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*206\r\n$gdb_prompt $" {
-                pass "v_int+=double"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_double" }
-            timeout           { fail "(timeout) v_int+=v_double" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_double" }
-    timeout           { fail "(timeout) v_int+=v_double" }    
-  }
+gdb_test_multiple "print v_int=57" "v_int=57" {
+    -re " = 57.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 57" "v_int=57"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6"
+
+gdb_test_multiple "print v_int+=57" "v_int+=57" {
+    -re " = 63.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 63" "v_int+=57"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (2)"
+
+gdb_test_multiple "print v_int-=57" "v_int-=57" {
+    -re " = -51.*$gdb_prompt $" {
+	gdb_test "print v_int" " = -51" "v_int-=57"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (3)"
+
+gdb_test_multiple "print v_int*=5" "v_int*=5" {
+    -re " = 30.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 30" "v_int*=5"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (4)"
+
+gdb_test_multiple "print v_int/=4" "v_int/=4" {
+    -re " = 1.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 1" "v_int/=4"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (5)"
+
+gdb_test_multiple "print v_int%=4" "v_int%=4" {
+    -re " = 2.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 2" "v_int%=4"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (6)"
+
+gdb_test_multiple "print v_int+=v_char" "v_int+=char" {
+    -re " = 71.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 71" "v_int+=char"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (7)"
+
+gdb_test_multiple "print v_int+=v_signed_char" "v_int+=signed_char" {
+    -re " = 72.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 72" "v_int+=signed_char"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (8)"
+
+gdb_test_multiple "print v_int+=v_unsigned_char" "v_int+=unsigned_char" {
+    -re " = 73.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 73" "v_int+=unsigned_char"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (9)"
+
+gdb_test_multiple "print v_int+=v_short" "v_int+=short" {
+    -re " = 9.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 9" "v_int+=short"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (10)"
+
+gdb_test_multiple "print v_int+=v_signed_short" "v_int+=signed_short" {
+    -re " = 10.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 10" "v_int+=signed_short"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (11)"
+
+gdb_test_multiple "print v_int+=v_unsigned_short" "v_int=+unsigned_short" {
+    -re " = 11.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 11" "v_int=+unsigned_short"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (12)"
+
+gdb_test_multiple "print v_int+=v_signed_int" "v_int+=signed_int" {
+    -re " = 13.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 13" "v_int+=signed_int"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (13)"
+
+gdb_test_multiple "print v_int+=v_unsigned_int" "v_int+=unsigned_int" {
+    -re " = 14.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 14" "v_int+=unsigned_int"
+    }
+}
 
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (14)"
 
+gdb_test_multiple "print v_int+=v_long" "v_int+=long" {
+    -re " = 15.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 15" "v_int+=long"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (15)"
+
+gdb_test_multiple "print v_int+=v_signed_long" "v_int+=signed_long" {
+    -re " = 16.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 16" "v_int+=signed_long"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (16)"
+
+gdb_test_multiple "print v_int+=v_unsigned_long" "v_int+=unsigned_long" {
+    -re " = 17.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 17" "v_int+=unsigned_long"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (17)"
+
+gdb_test_multiple "print v_int+=v_float" "v_int+=v_float" {
+    -re " = 106.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 106" "v_int+=v_float"
+    }
+}
+
+gdb_test_no_output "set variable v_int = 6" "set v_int to 6 (18)"
+
+gdb_test_multiple "print v_int+=v_double" "v_int+=double" {
+    -re " = 206.*$gdb_prompt $" {
+	gdb_test "print v_int" " = 206" "v_int+=double"
+    }
+}