diff options
| -rw-r--r-- | gdb/testsuite/gdb.python/py-inferior-leak.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb-python.exp | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.python/py-inferior-leak.exp b/gdb/testsuite/gdb.python/py-inferior-leak.exp index 9cd1ebf..15d7423 100644 --- 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 13a1ab5..60931fe 100644 --- 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} +} |