From 856cd0786ccea2f0b39d36024187c415e0a27d76 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 14 Jan 2023 12:42:30 -0700 Subject: Pass internal gdb flags to --configuration invocations The test suite uses the --configuration flag to feature-test gdb. However, when I added this, I neglected to pass the internal gdbflags to this, causing an error, which then caused failures in the test suite (which would not be seen if you'd ever run "make install"). This patch fixes the bug. Tested by removing my install tree first, to verify that I could reproduce the failure. --- gdb/testsuite/lib/gdb-guile.exp | 2 +- gdb/testsuite/lib/gdb.exp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/lib/gdb-guile.exp b/gdb/testsuite/lib/gdb-guile.exp index f230737..50189c8 100644 --- a/gdb/testsuite/lib/gdb-guile.exp +++ b/gdb/testsuite/lib/gdb-guile.exp @@ -21,7 +21,7 @@ set ghex {[0-9a-f]+} # Return a 1 for configurations that support Guile scripting. gdb_caching_proc allow_guile_tests { - set output [exec $::GDB --configuration] + set output [remote_exec host $::GDB "$::INTERNAL_GDBFLAGS --configuration"] return [expr {[string first "--with-guile" $output] != -1}] } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 5359315..68337bd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2450,7 +2450,7 @@ proc allow_rust_tests {} { # Return a 1 for configurations that support Python scripting. gdb_caching_proc allow_python_tests { - set output [remote_exec host $::GDB --configuration] + set output [remote_exec host $::GDB "$::INTERNAL_GDBFLAGS --configuration"] return [expr {[string first "--with-python" $output] != -1}] } @@ -2575,7 +2575,7 @@ gdb_caching_proc allow_dlmopen_tests { # Return 1 if we should allow TUI-related tests. gdb_caching_proc allow_tui_tests { - set output [remote_exec host $::GDB --configuration] + set output [remote_exec host $::GDB "$::INTERNAL_GDBFLAGS --configuration"] return [expr {[string first "--enable-tui" $output] != -1}] } -- cgit v1.1