Re: [PATCH v2] Require async support for DAP tests [PR34548]

[Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

Hi Andrew,

>> +# Return 1 if target supports asynchronous execution, otherwise return 0.
>> +gdb_caching_proc supports_target_async {} {
>> +    global srcdir subdir gdb_prompt
>
> These are not needed and should be removed.

right: they are a remnant of the explicit gdb_reinitialize_dir
$srcdir/$subdir in the first version.

>> +	gdb_test_multiple "continue &" "" {
>> +	    -re "Continuing..*" {
>> +		set res 1
>> +	    }
>> +	    -re ".*Asynchronous execution not supported on this target..*" {
>> +		set res 0
>> +	    }
>
> Both of these would be better written as '-re -wrap "....etc..."' adding
> the -wrap will cause the $gdb_prompt to be matched.  I don't think it
> really matters in this case as you do call gdb_exit immediately after,
> so I think any pending output from GDB is discarded, but it does make
> the gdb.log a little neater, and so easier to grok.

Unfortunately this doesn't work for the same reason I'd removed the
explicit $gdb_prompt anchor

      -re "Continuing\\.\r\n$gdb_prompt $" {

that I'd tried initially: in some cases, you get output like

(gdb) continue &^M
Continuing.^M
(gdb) [Inferior 1 (process 3669382) exited normally]^M
FAIL: gdb.dap/ada-scopes.exp: continue & (timeout)

instead of the expected

(gdb) continue &^M
Continuing.^M
(gdb) gdb_caching_proc supports_target_async caused gdb_exit to be called

causing supports_target_async to incorrectly return 0.

So that's what I'd like to check in.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: testsuite-dap-async.patch --]
[-- Type: text/x-patch, Size: 1593 bytes --]

# HG changeset patch
# Parent  069fc8428271fcfc95508f3097833f35443e371f
Require async support for DAP tests [PR34548]

diff --git a/gdb/testsuite/gdb.dap/pause.exp b/gdb/testsuite/gdb.dap/pause.exp
--- a/gdb/testsuite/gdb.dap/pause.exp
+++ b/gdb/testsuite/gdb.dap/pause.exp
@@ -15,9 +15,6 @@
 
 # Test "pause" in DAP.
 
-# PR dap/34548
-require {!istarget "*-*-solaris2*"}
-
 require allow_dap_tests
 
 load_lib dap-support.exp
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3070,6 +3070,10 @@ gdb_caching_proc with_system_readline {}
 }
 
 gdb_caching_proc allow_dap_tests {} {
+    if { ![supports_target_async] } {
+	return 0
+    }
+
     if { ![allow_python_tests] } {
 	return 0
     }
@@ -3908,6 +3912,35 @@ gdb_caching_proc supports_memtag {} {
     return 0
 }
 
+# Return 1 if target supports asynchronous execution, otherwise return 0.
+gdb_caching_proc supports_target_async {} {
+    set me "supports_target_async"
+
+    set src { int main() { return 0; } }
+    if {![gdb_simple_compile $me $src executable ""]} {
+	return 0
+    }
+
+    clean_restart
+    gdb_load $obj
+
+    set res 0
+    if { [runto_main] } {
+	gdb_test_multiple "continue &" "" {
+	    -re "Continuing..*" {
+		set res 1
+	    }
+	    -re ".*Asynchronous execution not supported on this target..*" {
+		set res 0
+	    }
+	}
+    }
+
+    gdb_exit
+    remote_file build delete $obj
+    return $res
+}
+
 # Return 1 if catch syscall is supported, otherwise return 0.
 
 gdb_caching_proc supports_catch_syscall {} {