gdb/testsuite/

	* lib/gdb.exp (gdb_test_multiple): Eror on newline in $message.
	* gdb.base/ifelse.exp: Give names to the "" tests as `if true else
	false #1', `if true else false #2' and `if true else false #3'.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 575d18b0fdc4741926c9f77d637a8d6e1d07c24c..4aa5513f24a01499c6a92d3e937d6a5b4e5ad3a5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * lib/gdb.exp (gdb_test_multiple): Eror on newline in $message.
+       * gdb.base/ifelse.exp: Give names to the "" tests as `if true else
+       false #1', `if true else false #2' and `if true else false #3'.
+
 2011-04-27  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
        * gdb.base/annota1.exp: Accept breakpoints-invalid annotation

diff --git a/gdb/testsuite/gdb.base/ifelse.exp b/gdb/testsuite/gdb.base/ifelse.exp
index 068957d041dfc1c8eb6e973a6e49a414266b5825..0a0bb0a369253d74a7a82221572f075765e7f548 100644 (file)
--- a/gdb/testsuite/gdb.base/ifelse.exp
+++ b/gdb/testsuite/gdb.base/ifelse.exp
@@ -57,7 +57,8 @@ gdb_test_multiple "if 0\nend" $message {
 # bodies and hopefully the memory with be dirty and the problem
 # will show itself (this works at time of writing).
 
-gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" ""
+gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" \
+        "if true else false #1"
 
 #    with true condition
 set message "if 1 .. else with empty body"
@@ -71,7 +72,8 @@ gdb_test_multiple "if 1\nelse\nend" $message {
 }
 
 # dirty memory
-gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" ""
+gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" \
+        "if true else false #2"
 
 #    with false condition
 set message "if 0 .. else with empty body"
@@ -89,7 +91,8 @@ gdb_test_no_output "set confirm off" ""
 # Test that a define with an empty else can be replaced.
 # If there is memory corruption then free will fail.
 # dirty memory
-gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" ""
+gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" \
+        "if true else false #3"
 # create
 gdb_test "define abc\nif 1\nelse\nend\nend" "" "create define with empty else"
 # call (note that condition is 1 so should pass)

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 805b7a26a2b4feaded81e71bf444fd7db7ae4c4b..5979888fb0c3cb46378d2140622e22323b88e2b3 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -597,6 +597,10 @@ proc gdb_test_multiple { command message user_code } {
        error "Invalid trailing newline in \"$message\" test"
     }
 
+    if [string match "*\[\r\n\]*" $message] {
+       error "Invalid newline in \"$message\" test"
+    }
+
     # TCL/EXPECT WART ALERT
     # Expect does something very strange when it receives a single braced
     # argument.  It splits it along word separators and performs substitutions.