diff options
| author | Tom de Vries <tdevries@suse.de> | 2023-06-13 12:21:45 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2023-06-13 12:21:45 +0200 |
| commit | 40bea10383b36fbe451d91ed0513792c399de1a6 (patch) | |
| tree | 56828bd4d8adee1498c32d92bfe4b103fc51352c /gdb/testsuite | |
| parent | bdde90c4cea27aacb0b98b4b1fa7289cb1a96168 (diff) | |
| download | gdb-40bea10383b36fbe451d91ed0513792c399de1a6.zip gdb-40bea10383b36fbe451d91ed0513792c399de1a6.tar.gz gdb-40bea10383b36fbe451d91ed0513792c399de1a6.tar.bz2 | |
[gdb/testsuite] Fix gdb.dap/type_check.exp with older python
On openSUSE Leap 15.4 with system python 3.6, I run into:
...
(gdb) python check_everything()^M
(gdb) FAIL: gdb.dap/type_check.exp: type checker
...
In check_everything, the hasattr test fails silently:
...
def check_everything():
# Older versions of Python can't really implement this.
if hasattr(typing, "get_origin"):
...
and that makes the gdb_test in the test-case fail.
Fix this by emitting UNSUPPORTED instead in check_everything, and detecting
this in the test-case.
Tested on x86_64-linux.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/gdb.dap/type_check.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dap/type_check.py | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/testsuite/gdb.dap/type_check.exp b/gdb/testsuite/gdb.dap/type_check.exp index 346b4ba..441588e 100644 --- a/gdb/testsuite/gdb.dap/type_check.exp +++ b/gdb/testsuite/gdb.dap/type_check.exp @@ -26,4 +26,11 @@ set remote_python_file \ [gdb_remote_download host ${srcdir}/${subdir}/${gdb_test_file_name}.py] gdb_test_no_output "source ${remote_python_file}" "load python file" -gdb_test "python check_everything()" OK "type checker" +gdb_test_multiple "python check_everything()" "type checker" { + -re -wrap "OK" { + pass $gdb_test_name + } + -re -wrap "UNSUPPORTED" { + unsupported $gdb_test_name + } +} diff --git a/gdb/testsuite/gdb.dap/type_check.py b/gdb/testsuite/gdb.dap/type_check.py index 1fdb595..ec4982c 100644 --- a/gdb/testsuite/gdb.dap/type_check.py +++ b/gdb/testsuite/gdb.dap/type_check.py @@ -94,3 +94,5 @@ def check_everything(): check_map() check_opt() print("OK") + else: + print("UNSUPPORTED") |