[binutils-gdb] [gdb/testsuite] Handle missing curses in gdb.python/py-missing-debug.exp

Tom de Vries vries@sourceware.org
Sun Sep 8 05:46:01 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=29c70787112e01cd52b53bf14bdcacb0a11e0725

commit 29c70787112e01cd52b53bf14bdcacb0a11e0725
Author: Tom de Vries <tdevries@suse.de>
Date:   Sun Sep 8 07:46:09 2024 +0200

    [gdb/testsuite] Handle missing curses in gdb.python/py-missing-debug.exp
    
    On a system with python 3.6, module gdb.missing_debug imports module curses,
    so when running test-case gdb.python/py-missing-debug.exp on a system without
    that module installed, we run into:
    ...
    (gdb) source py-missing-debug.py^M
    Python Exception <class 'ImportError'>: Module 'curses' is not installed.^M
    Use:^M
      sudo zypper install python36-curses^M
    to install it.^M
    Error occurred in Python: Module 'curses' is not installed.^M
    Use:^M
      sudo zypper install python36-curses^M
    to install it.^M
    (gdb) FAIL: gdb.python/py-missing-debug.exp: source python script
    ...
    
    Fix this by issuing UNSUPPORTED instead, and bailing out.
    
    Tested on x86_64-linux.
    
    Approved-by: Kevin Buettner <kevinb@redhat.com>
    
    PR testsuite/31576
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31576

Diff:
---
 gdb/testsuite/gdb.python/py-missing-debug.exp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.python/py-missing-debug.exp b/gdb/testsuite/gdb.python/py-missing-debug.exp
index dfc0a467b2a..9d853d3a311 100644
--- a/gdb/testsuite/gdb.python/py-missing-debug.exp
+++ b/gdb/testsuite/gdb.python/py-missing-debug.exp
@@ -58,8 +58,21 @@ with_test_prefix "initial checks" {
 }
 
 # Load the Python script into GDB.
-gdb_test "source $remote_python_file" "^Success" \
-    "source python script"
+set python_script_loaded 0
+set re_no_curses [string_to_regexp "Module 'curses' is not installed."]
+gdb_test_multiple "source $remote_python_file" "source python script" {
+    -re -wrap $re_no_curses.* {
+	unsupported $gdb_test_name
+    }
+    -re -wrap "^Success" {
+	set python_script_loaded 1
+	pass $gdb_test_name
+    }
+}
+
+if { ! $python_script_loaded } {
+    return
+}
 
 # Setup the separate debug info directory.  This isn't actually needed until
 # some of the later tests, but might as well get this done now.


More information about the Gdb-cvs mailing list