gdb/testsuite: check the python module is available before using it

The gdb.python/py-inferior-leak.exp test makes use of the tracemalloc
module.  When running the Python tests with a GDB built against Python
2 I ran into a test failure due to the tracemalloc module not being
available.

This commit adds a new helper function to lib/gdb-python.exp that
checks if a named module is available.  Using this we can then skip
the py-inferior-leak.exp test when the tracemalloc module is not
available.

diff --git a/gdb/testsuite/gdb.python/py-inferior-leak.exp b/gdb/testsuite/gdb.python/py-inferior-leak.exp
index 9cd1ebf243333e068316f32b52bc19b339242428..15d742391de57078ad5e852011c442afa4ab86a0 100644 (file)
--- a/gdb/testsuite/gdb.python/py-inferior-leak.exp
+++ b/gdb/testsuite/gdb.python/py-inferior-leak.exp
@@ -25,6 +25,12 @@ clean_restart
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
+# Skip this test if the tracemalloc module is not available.
+if { ![gdb_py_module_available "tracemalloc"] } {
+    unsupported "tracemalloc module not available"
+    continue
+}
+
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 
 # Source the Python script, this runs the test (which is written

diff --git a/gdb/testsuite/lib/gdb-python.exp b/gdb/testsuite/lib/gdb-python.exp
index 13a1ab517f17e91db7c53e4510d973858eebe86d..60931fec28aaac15bea7e028f0a08b00bdc35ad6 100644 (file)
--- a/gdb/testsuite/lib/gdb-python.exp
+++ b/gdb/testsuite/lib/gdb-python.exp
@@ -51,3 +51,28 @@ proc get_python_valueof { exp default {test ""} } {
     }
     return ${val}
 }
+
+# Return true if Python module NAME is available, otherwise, return
+# false.
+
+proc gdb_py_module_available { name } {
+    set available "unknown"
+    gdb_test_multiple "python import ${name}" "" {
+       -re -wrap "ModuleNotFoundError: No module named '${name}'.*" {
+           set available false
+       }
+       -re -wrap "ImportError: No module named ${name}.*" {
+           set available false
+       }
+       -re -wrap "python import ${name}" {
+           set available true
+       }
+    }
+
+    if { $available == "unknown" } {
+       perror "unexpected output from python import"
+       set available false
+    }
+
+    return ${available}
+}