diff options
| author | Lancelot SIX <lancelot.six@amd.com> | 2022-05-25 14:38:57 +0100 |
|---|---|---|
| committer | Lancelot SIX <lancelot.six@amd.com> | 2022-05-26 09:37:11 +0100 |
| commit | bfcd7c2160fd145a9d7ff215ff28cdf5e406af5a (patch) | |
| tree | 93e19309c17b94729e0da64dcc73b0b04b7472f7 | |
| parent | f67741e172bf342291fe3abd2b395899ce6433a0 (diff) | |
| download | binutils-bfcd7c2160fd145a9d7ff215ff28cdf5e406af5a.zip binutils-bfcd7c2160fd145a9d7ff215ff28cdf5e406af5a.tar.gz binutils-bfcd7c2160fd145a9d7ff215ff28cdf5e406af5a.tar.bz2 | |
gdb/testsuite: prefer gdb_test in gdb.dwarf2/calling-convention
Since ed01945057c "Make gdb_test's question non-optional if specified",
if the question and response parameters are given to gdb_test, the
framework enforces that GDB asks the question. Before this patch, tests
needed to use gdb_test_multiple to enforce this.
This patch updates the gdb.dwarf2/calling-convention.exp testcase to use
gdb_test to check that GDB asks a question. This replaces the more
complicated gdb_test_multiple based implementation.
Tested on x86_64-gnu-linux.
Change-Id: I7216e822ca68f2727e0450970097d74c27c432fe
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/calling-convention.exp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/testsuite/gdb.dwarf2/calling-convention.exp b/gdb/testsuite/gdb.dwarf2/calling-convention.exp index 77107a4..8c87a69 100644 --- a/gdb/testsuite/gdb.dwarf2/calling-convention.exp +++ b/gdb/testsuite/gdb.dwarf2/calling-convention.exp @@ -83,12 +83,14 @@ gdb_test "call foo ()" \ gdb_breakpoint "foo" gdb_continue_to_breakpoint "foo" -gdb_test_multiple "return 35" "" { - -re "Function 'foo' does not follow the target calling convention.\r\nIf you continue, setting the return value will probably lead to unpredictable behaviors.\r\nMake foo return now\\? \\(y or n\\) $" { - pass $gdb_test_name - gdb_test "n" "Not confirmed" "cancel return" - } -} +gdb_test "return 35" \ + "Not confirmed" \ + "return 35" \ + [multi_line \ + "Function 'foo' does not follow the target calling convention\\." \ + "If you continue, setting the return value will probably lead to unpredictable behaviors\\." \ + "Make foo return now\\? \\(y or n\\) $"] \ + "n" gdb_test "finish" [multi_line \ "Run till exit from #0 $hex in foo \\(\\)" \ |