From: Pedro Alves <pedro@palves.net>
Date: Wed, 30 Mar 2022 13:31:56 +0000 (+0100)
Subject: Fix bogus gdb_test invocations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fe69430d166bf287fe94a7fcecc7f867666ae5a;p=binutils-gdb.git

Fix bogus gdb_test invocations

A following patch will make gdb_test error out if bogus arguments are
passed, which exposed bugs in a few testcases:

 - gdb.python/py-parameter.exp, passing a spurious "1" as extra
   parameter, resulting in:

   ERROR: Unexpected arguments: {set test-file-param bar.txt} {The name of the file has been changed to bar.txt} {set new file parameter} 1

 - gdb.python/py-xmethods.exp, a missing test message, resulting in
   the next gdb_test being interpreted as message, question and
   response!  With the enforcing patch, this was caught with:

   ERROR: Unexpected arguments: {p g.mul<char>('a')} {From Python G<>::mul.*} gdb_test {p g_ptr->mul<char>('a')} {From Python G<>::mul.*} {after: g_ptr->mul<char>('a')}

 - gdb.base/pointers.exp, missing a quote.

Change-Id: I66f2db4412025a64121db7347dfb0b48240d46d4
---

diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index 15f7879a27f..e6406613318 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -209,7 +209,7 @@ gdb_test "print **ptr_to_ptr_to_float" " = 100" \
 
 gdb_test "break marker1" ".*" ""
 gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" \
-    continue to marker1"
+    "continue to marker1"
 gdb_test "up" "more_code.*" "up from marker1"
 
 gdb_test "print *pUC" " = 21 \'.025\'.*" "print value of *pUC"
diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp
index 98d4b2d4684..199d3bc16ec 100644
--- a/gdb/testsuite/gdb.python/py-parameter.exp
+++ b/gdb/testsuite/gdb.python/py-parameter.exp
@@ -199,7 +199,7 @@ proc_with_prefix test_file_parameter { } {
 	"The name of the file is foo.txt.*" "show initial file value"
     gdb_test "set test-file-param bar.txt" \
 	"The name of the file has been changed to bar.txt" \
-	"set new file parameter" 1
+	"set new file parameter"
     gdb_test "show test-file-param" \
 	"The name of the file is bar.txt.*" "show new file value"
     gdb_test "python print (test_file_param.value)" \
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index f879e9c15a2..18057782143 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -130,6 +130,7 @@ gdb_test "p g.size_mul<  5  >()" "From Python G<>::size_mul.*" \
 gdb_test "p g.mul<double>(2.0)" "From Python G<>::mul.*" \
   "after: g.mul<double>(2.0)"
 gdb_test "p g.mul<char>('a')" "From Python G<>::mul.*" \
+  "after: g.mul<char>('a')"
 gdb_test "p g_ptr->mul<char>('a')" "From Python G<>::mul.*" \
   "after: g_ptr->mul<char>('a')"