[v2] gdb/testsuite: explicitly test for stderr in gdb.mi/mi-dprintf.exp

Message ID 20230721095809.3479260-2-blarsen@redhat.com
State New
Headers
Series [v2] gdb/testsuite: explicitly test for stderr in gdb.mi/mi-dprintf.exp |

Commit Message

Guinevere Larsen July 21, 2023, 9:58 a.m. UTC
  As mentioned in commit 3f5bbc3e2075ef5061a815c73fdc277218489f22, some
compilers such as clang don't add debug information about stderr by
default, leaving it to external debug packages.

This commit adds a way to check if GDB has access to stderr information
when in MI mode, and uses this new mechanism to skip the related section
of the test gdb.mi/mi-dprintf.exp. It also fixes an incorrect name for a
test in that file.

Co-Authored-By: Andrew Burgess <aburgess@redhat.com>
---
 gdb/testsuite/gdb.mi/mi-dprintf.exp | 11 ++++++++---
 gdb/testsuite/lib/mi-support.exp    | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
  

Comments

Guinevere Larsen Aug. 3, 2023, 1:43 p.m. UTC | #1
Ping!
  
Guinevere Larsen Aug. 10, 2023, 1:52 p.m. UTC | #2
Ping!
  
Guinevere Larsen Aug. 23, 2023, 9:59 a.m. UTC | #3
On 10/08/2023 15:52, Guinevere Larsen wrote:
> Ping!
>
Ping!
  
Guinevere Larsen Sept. 14, 2023, 1:03 p.m. UTC | #4
On 23/08/2023 11:59, Guinevere Larsen wrote:
> On 10/08/2023 15:52, Guinevere Larsen wrote:
>> Ping!
>>
> Ping!
>
Ping!
  
Kevin Buettner Sept. 15, 2023, 12:29 a.m. UTC | #5
On Fri, 21 Jul 2023 11:58:10 +0200
Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> wrote:

> As mentioned in commit 3f5bbc3e2075ef5061a815c73fdc277218489f22, some
> compilers such as clang don't add debug information about stderr by
> default, leaving it to external debug packages.
> 
> This commit adds a way to check if GDB has access to stderr information
> when in MI mode, and uses this new mechanism to skip the related section
> of the test gdb.mi/mi-dprintf.exp. It also fixes an incorrect name for a
> test in that file.
> 
> Co-Authored-By: Andrew Burgess <aburgess@redhat.com>

LGTM.

Approved-by: Kevin Buettner <kevinb@redhat.com>
  
Guinevere Larsen Sept. 15, 2023, 7:36 a.m. UTC | #6
On 15/09/2023 02:29, Kevin Buettner wrote:
> On Fri, 21 Jul 2023 11:58:10 +0200
> Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> wrote:
>
>> As mentioned in commit 3f5bbc3e2075ef5061a815c73fdc277218489f22, some
>> compilers such as clang don't add debug information about stderr by
>> default, leaving it to external debug packages.
>>
>> This commit adds a way to check if GDB has access to stderr information
>> when in MI mode, and uses this new mechanism to skip the related section
>> of the test gdb.mi/mi-dprintf.exp. It also fixes an incorrect name for a
>> test in that file.
>>
>> Co-Authored-By: Andrew Burgess <aburgess@redhat.com>
> LGTM.
>
> Approved-by: Kevin Buettner <kevinb@redhat.com>
>
Thanks pushed!
  

Patch

diff --git a/gdb/testsuite/gdb.mi/mi-dprintf.exp b/gdb/testsuite/gdb.mi/mi-dprintf.exp
index e40fa6121fa..d771993386b 100644
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -127,6 +127,7 @@  proc mi_continue_dprintf {args} {
 mi_continue_dprintf "gdb"
 
 # The "call" style depends on having I/O functions available, so test.
+set has_stderr_symbol [mi_gdb_is_stderr_available]
 
 if ![target_info exists gdb,noinferiorio] {
 
@@ -136,9 +137,13 @@  if ![target_info exists gdb,noinferiorio] {
     mi_gdb_test "set dprintf-style call" ".*" "mi set dprintf style to call"
     mi_continue_dprintf "call"
 
-    mi_gdb_test "set dprintf-function fprintf" ".*" "mi set dprintf-channel stderr"
-    mi_gdb_test "set dprintf-channel stderr" ".*" "mi set dprintf channel"
-    mi_continue_dprintf "fprintf"
+    # Some compilers don't add information about stderr,
+    # so skip these tests if needed.
+    if {$::has_stderr_symbol} {
+	mi_gdb_test "set dprintf-function fprintf" ".*" "mi set dprintf function"
+	mi_gdb_test "set dprintf-channel stderr" ".*" "mi set dprintf channel"
+	mi_continue_dprintf "fprintf"
+    }
 }
 
 set target_can_dprintf 0
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 49d5e2ef272..468c481ab95 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -2883,3 +2883,17 @@  proc foreach_mi_ui_mode { var_name body } {
        }
     }
 }
+
+# Check if GDB has information about the stderr symbol.
+proc mi_gdb_is_stderr_available {} {
+    set has_stderr_symbol false
+    gdb_test_multiple "-data-evaluate-expression stderr" "stderr symbol check" {
+	-re "\\^error,msg=\"'stderr' has unknown type; cast it to its declared type\"\r\n$::mi_gdb_prompt$" {
+	    # Default value of false is fine.
+	}
+	-re "$::mi_gdb_prompt$" {
+	    set has_stderr_symbol true
+	}
+    }
+    return $has_stderr_symbol
+}