aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2023-11-24 15:38:17 +0100
committerTom de Vries <tdevries@suse.de>2023-11-24 15:38:17 +0100
commit15717656549b6af941511dde20a51475c932645e (patch)
treebcb1e444616105ad4118c7cd4c35c700e3d242d9
parentfa1c74b22aa8c465974ddf792395d8e313199a52 (diff)
downloadgdb-15717656549b6af941511dde20a51475c932645e.zip
gdb-15717656549b6af941511dde20a51475c932645e.tar.gz
gdb-15717656549b6af941511dde20a51475c932645e.tar.bz2
[gdb/testsuite] Two fixes in gdb.python/tui-window-disabled.exp
I ran test-case gdb.python/tui-window-disabled.exp on a configuration without python support, and ran into: ... PASS: $exp: cleanup_properly=True: initial restart: set pagination off UNSUPPORTED: $exp: cleanup_properly=True: couldn't restart GDB PASS: $exp: cleanup_properly=False: initial restart: set pagination off UNSUPPORTED: $exp: cleanup_properly=False: couldn't restart GDB ... After looking into the test-case, I realized that this is a consequence of !allow_python_tests. Handle this instead by requiring allow_python_tests, such that we get the usual and more clear: ... UNSUPPORTED: $exp: require failed: allow_python_tests ... Also fix a return without value in clean_restart_and_setup, which if triggered would cause: ... ERROR: expected boolean value but got "" ... Tested on x86_64-linux.
-rw-r--r--gdb/testsuite/gdb.python/tui-window-disabled.exp7
1 files changed, 2 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.python/tui-window-disabled.exp b/gdb/testsuite/gdb.python/tui-window-disabled.exp
index fc69b2b..1d10437 100644
--- a/gdb/testsuite/gdb.python/tui-window-disabled.exp
+++ b/gdb/testsuite/gdb.python/tui-window-disabled.exp
@@ -22,7 +22,7 @@
# though the tui should be disabled.
load_lib gdb-python.exp
-require allow_tui_tests
+require allow_tui_tests allow_python_tests
tuiterm_env
standard_testfile
@@ -49,9 +49,6 @@ proc clean_restart_and_setup { prefix } {
Term::clean_restart 24 80 $testfile
- # Skip all tests if Python scripting is not enabled.
- if { ![allow_python_tests] } { return 0 }
-
# Now source the python script.
gdb_test_no_output "source ${remote_python_file}" \
"source ${testfile}.py"
@@ -64,7 +61,7 @@ proc clean_restart_and_setup { prefix } {
if {![runto_main]} {
perror "test suppressed"
- return
+ return 0
}
}