gdb/remote: handle attach when stop packet lacks thread-id

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.server / ext-attach.exp

diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index c9766e3531775f8147a088e9eeacbbce782e5ae4..fe936dedf5ad8c11245d597ed26eb8e950cb369d 100644 (file)
--- a/gdb/testsuite/gdb.server/ext-attach.exp
+++ b/gdb/testsuite/gdb.server/ext-attach.exp
@@ -30,53 +30,80 @@ if {![can_spawn_for_attach]} {
     return 0
 }
 
-save_vars { GDBFLAGS } {
-    # If GDB and GDBserver are both running locally, set the sysroot to avoid
-    # reading files via the remote protocol.
-    if { ![is_remote host] && ![is_remote target] } {
-       set GDBFLAGS "$GDBFLAGS -ex \"set sysroot\""
-    }
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
+    return -1
+}
 
-    if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
-       return -1
+# Run the test.  TARGET_NON_STOP and TARGET_ASYNC should be 'on'
+# or 'off'.  TO_DISABLE should be either the empty string, or
+# something that can be passed to gdbserver's --disable-packet command
+# line option.
+proc run_test { target_async target_non_stop to_disable } {
+    save_vars { ::GDBFLAGS } {
+       append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\""
+       append ::GDBFLAGS " -ex \"maintenance set target-async ${target_async}\""
+
+       # If GDB and GDBserver are both running locally, set the sysroot to avoid
+       # reading files via the remote protocol.
+       if { ![is_remote host] && ![is_remote target] } {
+           set ::GDBFLAGS "$::GDBFLAGS -ex \"set sysroot\""
+       }
+
+       clean_restart $::binfile
     }
-}
 
-# Make sure we're disconnected, in case we're testing with an
-# extended-remote board, therefore already connected.
-gdb_test "disconnect" ".*"
+    # Make sure we're disconnected, in case we're testing with an
+    # extended-remote board, therefore already connected.
+    gdb_test "disconnect" ".*"
 
-set target_exec [gdbserver_download_current_prog]
-gdbserver_start_extended
+    if { [gdb_target_supports_trace] } then {
+       # Test predefined TSVs are uploaded.
+       gdb_test_sequence "info tvariables" "check uploaded tsv" {
+           "\[\r\n\]+Name\[\t \]+Initial\[\t \]+Current"
+           "\[\r\n\]+\\\$trace_timestamp 0"
+       }
+    }
 
-gdb_test_no_output "set remote exec-file $target_exec" "set remote exec-file"
+    set target_exec [gdbserver_download_current_prog]
+    if { $to_disable != "" } {
+       set gdbserver_opts "--disable-packet=${to_disable}"
+    } else {
+       set gdbserver_opts ""
+    }
+    gdbserver_start_extended $gdbserver_opts
 
-set test_spawn_id [spawn_wait_for_attach $binfile]
-set testpid [spawn_id_get_pid $test_spawn_id]
+    gdb_test_no_output "set remote exec-file $target_exec" "set remote exec-file"
 
-gdb_test "attach $testpid" \
-    "Attaching to program: .*, process $testpid.*(in|at).*" \
-    "attach to remote program 1"
+    set test_spawn_id [spawn_wait_for_attach $::binfile]
+    set testpid [spawn_id_get_pid $test_spawn_id]
 
-if { [gdb_target_supports_trace] } then {
-    # Test predefined TSVs are uploaded.
-    gdb_test_sequence "info tvariables" "check uploaded tsv" {
-       "\[\r\n\]+Name\[\t \]+Initial\[\t \]+Current"
-       "\[\r\n\]+\\\$trace_timestamp 0"
-    }
-}
+    gdb_test "attach $testpid" \
+       "Attaching to program: .*, process $testpid.*(in|at).*" \
+       "attach to remote program 1"
+
+    gdb_test "backtrace" ".*main.*" "backtrace 1"
 
-gdb_test "backtrace" ".*main.*" "backtrace 1"
+    gdb_test "detach" "Detaching from program.*process.*"
+    gdb_test "backtrace" "No stack\\." "backtrace with no program"
 
-gdb_test "detach" "Detaching from program.*process.*"
-gdb_test "backtrace" "No stack\\." "backtrace with no program"
+    gdb_test "attach $testpid" \
+       "Attaching to program: .*, process $testpid.*(in|at).*" \
+       "attach to remote program 2"
+    gdb_test "backtrace" ".*main.*" "backtrace 2"
 
-gdb_test "attach $testpid" \
-    "Attaching to program: .*, process $testpid.*(in|at).*" \
-    "attach to remote program 2"
-gdb_test "backtrace" ".*main.*" "backtrace 2"
+    gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
+    gdb_test_no_output "monitor exit"
 
-gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
-gdb_test_no_output "monitor exit"
+    kill_wait_spawned_process $test_spawn_id
+}
 
-kill_wait_spawned_process $test_spawn_id
+# Don't run with target_async set to "off".  There are bugs with the
+# extended-remote target when async mode is off and we try to attach.
+# These bugs have been fixed in the master branch.
+foreach_with_prefix target_async {"on"} {
+    foreach_with_prefix target_non_stop {"off" "on"} {
+       foreach_with_prefix to_disable { "" Tthread T } {
+           run_test ${target_async} ${target_non_stop} $to_disable
+       }
+    }
+}