diff options
author | Tom de Vries <tdevries@suse.de> | 2023-05-30 17:49:31 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2023-05-30 17:49:31 +0200 |
commit | 37d9880d653c1d91e763c6b6ab22c28883996447 (patch) | |
tree | 03a53b1887675e73889217b38c74b1efa4fc1ef9 | |
parent | 35f8b0595f70b7ea644fd38c1c14eeaa9a01430c (diff) | |
download | gdb-37d9880d653c1d91e763c6b6ab22c28883996447.zip gdb-37d9880d653c1d91e763c6b6ab22c28883996447.tar.gz gdb-37d9880d653c1d91e763c6b6ab22c28883996447.tar.bz2 |
[gdb] Mention --with/without-system-readline for --configuration
Simon reported that the new test-case gdb.tui/pr30056.exp fails with system
readline.
This is because the test-case requires a fix in readline that's present in our
in-repo copy of readline, but most likely not in any system readline yet.
Fix this by:
- mentioning --with-system-readline or --without-system-readline in the
configuration string.
- adding a new proc with_system_readline that makes this information available
in the testsuite.
- using this in test-case gdb.tui/pr30056.exp to declare it unsupported for
--with-system-readline.
Tested on x86_64-linux.
Reported-By: Simon Marchi <simon.marchi@efficios.com>
Approved-By: Simon Marchi <simon.marchi@efficios.com>
-rw-r--r-- | gdb/testsuite/gdb.tui/pr30056.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 8 | ||||
-rw-r--r-- | gdb/top.c | 10 |
3 files changed, 22 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.tui/pr30056.exp b/gdb/testsuite/gdb.tui/pr30056.exp index 7a57a56..4ca7a8b 100644 --- a/gdb/testsuite/gdb.tui/pr30056.exp +++ b/gdb/testsuite/gdb.tui/pr30056.exp @@ -15,6 +15,10 @@ # Regression test for PR30056. +# This PR is fixed in the in-repo copy of readline. System readline may or +# may not be fixed, so skip this test-case. +require !with_system_readline + tuiterm_env save_vars { env(LC_ALL) } { diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 133d914..294d136 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2565,6 +2565,14 @@ gdb_caching_proc allow_python_tests {} { return [expr {[string first "--with-python" $output] != -1}] } +# Return a 1 for configurations that use system readline rather than the +# in-repo copy. + +gdb_caching_proc with_system_readline {} { + set output [remote_exec host $::GDB "$::INTERNAL_GDBFLAGS --configuration"] + return [expr {[string first "--with-system-readline" $output] != -1}] +} + gdb_caching_proc allow_dap_tests {} { if { ![allow_python_tests] } { return 0 @@ -1560,6 +1560,16 @@ This GDB was configured as follows:\n\ ")); #endif +#ifdef HAVE_READLINE_READLINE_H + gdb_printf (stream, _("\ + --with-system-readline\n\ +")); +#else + gdb_printf (stream, _("\ + --without-system-readline\n\ +")); +#endif + #ifdef RELOC_SRCDIR gdb_printf (stream, _("\ --with-relocated-sources=%s\n\ |