gdb: add target_ops::supports_displaced_step

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / a2-run.exp

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index dd6af254d5acf07c7d5f4e3fe2a3358fd2499c4d..ea8f7ec95f49415b15e0da36ddf7251201f0d822 100644 (file)
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -1,4 +1,4 @@
-#   Copyright 1988-2015 Free Software Foundation, Inc.
+#   Copyright 1988-2020 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ if [gdb_skip_stdio_test "a2run.exp"] {
 
 standard_testfile run.c
 
-if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
     return -1
 }
 
@@ -39,57 +39,73 @@ set saw_spurious_output 0
 
 set test "run \"$testfile\" with no args"
 
+# Indirect spawn id lists.  Used to be able to disable the inferior
+# and gdb's spawn_ids and regexes as soon as we see the expected
+# output.
 set inferior_spawn_list "$inferior_spawn_id"
 set gdb_spawn_list "$gdb_spawn_id"
 
+# Clear either the gdb or the inferior spawn_id list and iff
+# afterwards we still have any spawn id in the indirect lists,
+# continue expecting.
+proc maybe_exp_continue {which} {
+    global inferior_spawn_list gdb_spawn_list
+
+    if {$which == "gdb"} {
+       set gdb_spawn_list ""
+    } elseif {$which == "inferior"} {
+       set inferior_spawn_list ""
+    } else {
+       error "invalid parameter"
+    }
+
+    if {$inferior_spawn_list != "" || $gdb_spawn_list != ""} {
+       exp_continue
+    }
+}
+
+# Note that if $inferior_spawn_id != $gdb_spawn_id the order we pick
+# output from each spawn id is undefined.
 set res [gdb_test_multiple "" $test {
     -i inferior_spawn_list
     -re "usage:  factorial <number>" {
        set saw_usage 1
-       exp_continue
+       maybe_exp_continue inferior
     }
     -re "EXIT code 1" {
        set saw_exit_wrapper 1
-       set inferior_spawn_list ""
-       exp_continue
+       maybe_exp_continue inferior
     }
     eof {
        if {$inferior_spawn_id != $gdb_spawn_id} {
            # In this case we may see the server/inferior exit before
            # GDB's program exit output.  Remove from spawn list and
            # continue waiting.
-           set inferior_spawn_list ""
-           exp_continue
+           maybe_exp_continue inferior
+       } else {
+           # GDB crash.
+           fail "$test (eof)"
        }
-       # GDB crash.
-       fail "$test (eof)"
     }
 
     -i gdb_spawn_list
 
     -re "$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
+       maybe_exp_continue gdb
     }
     -re "$inferior_exited_re with code 01.*$gdb_prompt $" {
        set saw_spurious_output 1
+       maybe_exp_continue gdb
     }
 
     -re "$inferior_exited_re normally.\r\n$gdb_prompt $" {
        # This is only considered a pass if we see the exit wrapper
-       # status.  Since if $inferior_spawn_id != $gdb_spawn_id the
-       # order we pick output from each spawn id isn't defined,
-       # remove gdb_spawn_id from the match lists and go back to
-       # waiting.  If we had already seen the status wrapper exit,
-       # gdb_test_multiple/expect has no spawn ids left, and thus
-       # returns.
-       set gdb_spawn_list ""
-       exp_continue
+       # status.
+       maybe_exp_continue gdb
     }
     -re "$inferior_exited_re normally.*$gdb_prompt $" {
        set saw_spurious_output 1
-
-       # See above.
-       set gdb_spawn_list ""
-       exp_continue
+       maybe_exp_continue gdb
     }
 }]
 
@@ -119,7 +135,7 @@ gdb_run_cmd 5
 gdb_test_stdio "" "120" "" "run \"$testfile\" with arg"
 
 # Run again with same arguments.
-gdb_run_cmd
+gdb_run_cmd 5
 
 setup_xfail "arm-*-coff"
 gdb_test_stdio "" "120" "" "run \"$testfile\" again with same args"
@@ -131,6 +147,15 @@ gdb_run_cmd
 
 gdb_test_stdio "" "usage:  factorial <number>" "" "run after setting args to nil"
 
+# The remaining tests pass inferior arguments through GDB, so doesn't
+# work with stub targets, where GDB connects to debug an already started
+# process.
+
+if [use_gdb_stub] {
+    verbose "Skipping rest of a2-run.exp because target is a stub."
+    return
+}
+
 # Use "set args" command to specify an argument and run again.
 gdb_test_no_output "set args 6"