diff options
| author | Tom de Vries <tdevries@suse.de> | 2019-08-26 18:48:02 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2019-08-26 18:48:02 +0200 |
| commit | b694989f508a83dd7c1f5d0d08716439d312e1cb (patch) | |
| tree | 2892923838fefd1b187685a74a553a7c413ceeee | |
| parent | d9c4ba536c522b8dc2194d4100270a159be7894a (diff) | |
| download | binutils-gdb-b694989f508a83dd7c1f5d0d08716439d312e1cb.tar.gz | |
[gdb/testsuite] Make skip_libstdcxx_probe_tests return 1 if true
The tcl proc skip_libstdcxx_probe_tests currently returns 0 if the probe tests
need to be skipped, while tcl interprets 0 as false rather than true, which is
confusing.
Fix this by making skip_libstdcxx_probe_tests return 1 if the probe tests need
to be skipped.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2019-08-26 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (skip_libstdcxx_probe_tests_prompt): Return 1 if probe
* tests need to be skipped.
* gdb.cp/exceptprint.exp: Update call to skip_libstdcxx_probe_tests.
* gdb.mi/mi-catch-cpp-exceptions.exp: Update call to
mi_skip_libstdcxx_probe_tests.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/exceptprint.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 9 |
4 files changed, 15 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e8445f8e88b..c41b4981e33 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2019-08-26 Tom de Vries <tdevries@suse.de> + + * lib/gdb.exp (skip_libstdcxx_probe_tests_prompt): Return 1 if probe + * tests need to be skipped. + * gdb.cp/exceptprint.exp: Update call to skip_libstdcxx_probe_tests. + * gdb.mi/mi-catch-cpp-exceptions.exp: Update call to + mi_skip_libstdcxx_probe_tests. + 2019-08-26 Sergio Durigan Junior <sergiodj@redhat.com> * gdb.python/py-xmethods.exp: Use raw strings when passing diff --git a/gdb/testsuite/gdb.cp/exceptprint.exp b/gdb/testsuite/gdb.cp/exceptprint.exp index 46378d1b69b..f6dcd0f5bdf 100644 --- a/gdb/testsuite/gdb.cp/exceptprint.exp +++ b/gdb/testsuite/gdb.cp/exceptprint.exp @@ -27,7 +27,7 @@ if {![runto_main]} { return -1 } -if {![skip_libstdcxx_probe_tests]} { +if {[skip_libstdcxx_probe_tests]} { untested "could not find libstdc++ stap probe" return -1 } diff --git a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp index 029dc1bd025..29514978824 100644 --- a/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp +++ b/gdb/testsuite/gdb.mi/mi-catch-cpp-exceptions.exp @@ -36,7 +36,7 @@ mi_gdb_load ${binfile} if {![mi_run_to_main]} { return -1 } -set libstdcxx_probe_tests_supported [mi_skip_libstdcxx_probe_tests] +set libstdcxx_probe_tests_supported [expr ![mi_skip_libstdcxx_probe_tests]] # Grab some line numbers we'll need. set catch_1_lineno [gdb_get_line_number "Catch 1"] diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index af56e8aa128..76805fb5ecd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3158,20 +3158,21 @@ proc skip_unwinder_tests {} { return $ok } -# Return 0 if we should skip tests that require the libstdc++ stap +# Return 1 if we should skip tests that require the libstdc++ stap # probes. This must be invoked while gdb is running, after shared # libraries have been loaded. PROMPT_REGEXP is the expected prompt. proc skip_libstdcxx_probe_tests_prompt { prompt_regexp } { - set ok 0 + set supported 0 gdb_test_multiple "info probe" "check for stap probe in libstdc++" { -re ".*libstdcxx.*catch.*\r\n$prompt_regexp" { - set ok 1 + set supported 1 } -re "\r\n$prompt_regexp" { } } "$prompt_regexp" - return $ok + set skip [expr !$supported] + return $skip } # As skip_libstdcxx_probe_tests_prompt, with gdb_prompt. |