[v2,57/79] Rename to allow_btrace_tests

Message ID 20230112030052.3306113-58-tom@tromey.com
State Committed
Headers
Series Rewrite "require" test procedure and use it more often |

Commit Message

Tom Tromey Jan. 12, 2023, 3 a.m. UTC
  This changes skip_btrace_tests to invert the sense, and renames it to
allow_btrace_tests.
---
 gdb/testsuite/gdb.btrace/buffer-size.exp      |  2 +-
 gdb/testsuite/gdb.btrace/data.exp             |  2 +-
 gdb/testsuite/gdb.btrace/delta.exp            |  2 +-
 gdb/testsuite/gdb.btrace/dlopen.exp           |  2 +-
 .../gdb.btrace/enable-new-thread.exp          |  2 +-
 gdb/testsuite/gdb.btrace/enable-running.exp   |  2 +-
 gdb/testsuite/gdb.btrace/enable.exp           |  2 +-
 gdb/testsuite/gdb.btrace/exception.exp        |  2 +-
 .../gdb.btrace/function_call_history.exp      |  2 +-
 gdb/testsuite/gdb.btrace/gcore.exp            |  2 +-
 .../gdb.btrace/instruction_history.exp        |  2 +-
 gdb/testsuite/gdb.btrace/multi-inferior.exp   |  2 +-
 .../gdb.btrace/multi-thread-step.exp          |  2 +-
 gdb/testsuite/gdb.btrace/nohist.exp           |  2 +-
 gdb/testsuite/gdb.btrace/non-stop.exp         |  2 +-
 gdb/testsuite/gdb.btrace/reconnect.exp        |  2 +-
 gdb/testsuite/gdb.btrace/record_goto-step.exp |  2 +-
 gdb/testsuite/gdb.btrace/record_goto.exp      |  2 +-
 gdb/testsuite/gdb.btrace/rn-dl-bind.exp       |  2 +-
 gdb/testsuite/gdb.btrace/segv.exp             |  2 +-
 gdb/testsuite/gdb.btrace/step.exp             |  2 +-
 gdb/testsuite/gdb.btrace/stepi.exp            |  2 +-
 gdb/testsuite/gdb.btrace/tailcall-only.exp    |  2 +-
 gdb/testsuite/gdb.btrace/tailcall.exp         |  2 +-
 .../gdb.btrace/unknown_functions.exp          |  2 +-
 gdb/testsuite/gdb.btrace/vdso.exp             |  2 +-
 .../gdb.python/py-record-btrace-threads.exp   |  2 +-
 gdb/testsuite/gdb.python/py-record-btrace.exp |  2 +-
 gdb/testsuite/lib/gdb.exp                     | 30 +++++++++----------
 29 files changed, 43 insertions(+), 43 deletions(-)
  

Comments

Terekhov, Mikhail via Gdb-patches Jan. 12, 2023, 6:39 a.m. UTC | #1
>This changes skip_btrace_tests to invert the sense, and renames it to
>allow_btrace_tests.
>---
> gdb/testsuite/gdb.btrace/buffer-size.exp      |  2 +-
> gdb/testsuite/gdb.btrace/data.exp             |  2 +-
> gdb/testsuite/gdb.btrace/delta.exp            |  2 +-
> gdb/testsuite/gdb.btrace/dlopen.exp           |  2 +-
> .../gdb.btrace/enable-new-thread.exp          |  2 +-
> gdb/testsuite/gdb.btrace/enable-running.exp   |  2 +-
> gdb/testsuite/gdb.btrace/enable.exp           |  2 +-
> gdb/testsuite/gdb.btrace/exception.exp        |  2 +-
> .../gdb.btrace/function_call_history.exp      |  2 +-
> gdb/testsuite/gdb.btrace/gcore.exp            |  2 +-
> .../gdb.btrace/instruction_history.exp        |  2 +-
> gdb/testsuite/gdb.btrace/multi-inferior.exp   |  2 +-
> .../gdb.btrace/multi-thread-step.exp          |  2 +-
> gdb/testsuite/gdb.btrace/nohist.exp           |  2 +-
> gdb/testsuite/gdb.btrace/non-stop.exp         |  2 +-
> gdb/testsuite/gdb.btrace/reconnect.exp        |  2 +-
> gdb/testsuite/gdb.btrace/record_goto-step.exp |  2 +-
> gdb/testsuite/gdb.btrace/record_goto.exp      |  2 +-
> gdb/testsuite/gdb.btrace/rn-dl-bind.exp       |  2 +-
> gdb/testsuite/gdb.btrace/segv.exp             |  2 +-
> gdb/testsuite/gdb.btrace/step.exp             |  2 +-
> gdb/testsuite/gdb.btrace/stepi.exp            |  2 +-
> gdb/testsuite/gdb.btrace/tailcall-only.exp    |  2 +-
> gdb/testsuite/gdb.btrace/tailcall.exp         |  2 +-
> .../gdb.btrace/unknown_functions.exp          |  2 +-
> gdb/testsuite/gdb.btrace/vdso.exp             |  2 +-
> .../gdb.python/py-record-btrace-threads.exp   |  2 +-
> gdb/testsuite/gdb.python/py-record-btrace.exp |  2 +-
> gdb/testsuite/lib/gdb.exp                     | 30 +++++++++----------
> 29 files changed, 43 insertions(+), 43 deletions(-)

Looks good to me.

Thanks,
Markus.
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
  

Patch

diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp
index d0a9086604f..e632ba56cf9 100644
--- a/gdb/testsuite/gdb.btrace/buffer-size.exp
+++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp
index 8be2a4ccdea..67d4b094a8d 100644
--- a/gdb/testsuite/gdb.btrace/data.exp
+++ b/gdb/testsuite/gdb.btrace/data.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp
index e4307e15a5b..f671937d260 100644
--- a/gdb/testsuite/gdb.btrace/delta.exp
+++ b/gdb/testsuite/gdb.btrace/delta.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index b742cfa86bd..8cd0b9db9aa 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -15,7 +15,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests !skip_shlib_tests
+require allow_btrace_tests !skip_shlib_tests
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.btrace/enable-new-thread.exp b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
index 22cc33f142f..a9c7d579e8b 100644
--- a/gdb/testsuite/gdb.btrace/enable-new-thread.exp
+++ b/gdb/testsuite/gdb.btrace/enable-new-thread.exp
@@ -17,7 +17,7 @@ 
 
 # Test that new threads of recorded inferiors also get recorded.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] {
diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp
index 6e626e3a053..9dea21f5dfd 100644
--- a/gdb/testsuite/gdb.btrace/enable-running.exp
+++ b/gdb/testsuite/gdb.btrace/enable-running.exp
@@ -15,7 +15,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index bb57f7b8a74..acad4c6e828 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # start fresh - without an executable
 gdb_exit
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
index e84ff14d193..9f12abab323 100755
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # We expect a specific function call history.  This gets messed up with
 # PIE on 32-bit.
diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp
index fd35d762796..e71e48fc0ca 100644
--- a/gdb/testsuite/gdb.btrace/function_call_history.exp
+++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # We expect a specific function call history.  This gets messed up with
 # PIE on 32-bit.
diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp
index 1e98860aee3..d18bda53469 100644
--- a/gdb/testsuite/gdb.btrace/gcore.exp
+++ b/gdb/testsuite/gdb.btrace/gcore.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp
index 0e525c73cb7..35b43d68434 100644
--- a/gdb/testsuite/gdb.btrace/instruction_history.exp
+++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile .c .S
 if [prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" {debug}] {
diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp
index bbc03daaccc..79e5a1c39bf 100644
--- a/gdb/testsuite/gdb.btrace/multi-inferior.exp
+++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp
@@ -22,7 +22,7 @@ 
 #
 # Each inferior can be recorded separately.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 require !use_gdb_stub
 
diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
index a18734843ae..af61e5e73da 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
index 0875b8a6e22..f4ab977ded8 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 278064fbac5..530fafd9573 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -15,7 +15,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp
index 548aa16ed29..1da9f4be566 100644
--- a/gdb/testsuite/gdb.btrace/reconnect.exp
+++ b/gdb/testsuite/gdb.btrace/reconnect.exp
@@ -19,7 +19,7 @@ 
 
 load_lib gdbserver-support.exp
 
-require !skip_btrace_tests
+require allow_btrace_tests
 require !skip_gdbserver_tests
 
 standard_testfile
diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp
index 1f289b47f64..35731c72b40 100644
--- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index dce9ca18c6c..240e18f67d6 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # The "record goto" command jumps to a specific instruction in the execution
 # trace.  To guarantee that we always get the same execution trace, we use
diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
index f61aa936a8d..4a419a84fbb 100644
--- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
+++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
@@ -21,7 +21,7 @@ 
 # Test that we can reverse-next over the dynamic linker's symbol
 # lookup code.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if [prepare_for_testing "failed to prepare" $testfile $srcfile \
diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp
index 9d256795729..dfd04b3cae7 100644
--- a/gdb/testsuite/gdb.btrace/segv.exp
+++ b/gdb/testsuite/gdb.btrace/segv.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
index 8ad58d48fdc..219775cdeb1 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile record_goto.c
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index f659d58cf7c..4592309796e 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # This test is stepping on instruction level.  To guarantee that we always
 # get the same execution trace, we use an assembly source file.
diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
index 16541b2eacf..857cc375ba3 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -20,7 +20,7 @@ 
 # calls.  This used to cause a crash in get_frame_type.
 #
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # This test requires the compiler to generate a tail call.  To guarantee that
 # we always get one, we use an assembly source file.
diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
index f422fbb1b2a..7fbcd40c077 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 # This test requires the compiler to generate a tail call.  To guarantee that
 # we always get one, we use an assembly source file.
diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp
index 291d7df5963..fadfabd57b8 100644
--- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
+++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
@@ -17,7 +17,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
index 16a7e230786..2bfc476b3cc 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -20,7 +20,7 @@ 
 #
 # Test that we can access the vdso memory during replay for stepping.
 
-require !skip_btrace_tests
+require allow_btrace_tests
 
 standard_testfile
 if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
diff --git a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
index f0845f8bbd5..ca9552754f3 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace-threads.exp
@@ -17,7 +17,7 @@ 
 
 load_lib gdb-python.exp
 
-require !skip_btrace_tests !skip_python_tests
+require allow_btrace_tests !skip_python_tests
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index 1326e8283b9..1b9824e284b 100644
--- a/gdb/testsuite/gdb.python/py-record-btrace.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
@@ -17,7 +17,7 @@ 
 
 # Skip this test if btrace is disabled.
 
-require !skip_btrace_tests !skip_python_tests
+require allow_btrace_tests !skip_python_tests
 
 load_lib gdb-python.exp
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 8d817dfa682..40a12612b3e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3801,22 +3801,22 @@  gdb_caching_proc allow_avx512fp16_tests {
     return $allow_avx512fp16_tests
 }
 
-# Run a test on the target to see if it supports btrace hardware.  Return 0 if so,
-# 1 if it does not.  Based on 'check_vmx_hw_available' from the GCC testsuite.
+# Run a test on the target to see if it supports btrace hardware.  Return 1 if so,
+# 0 if it does not.  Based on 'check_vmx_hw_available' from the GCC testsuite.
 
-gdb_caching_proc skip_btrace_tests {
+gdb_caching_proc allow_btrace_tests {
     global srcdir subdir gdb_prompt inferior_exited_re
 
-    set me "skip_btrace_tests"
+    set me "allow_btrace_tests"
     if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } {
-        verbose "$me:  target does not support btrace, returning 1" 2
-        return 1
+	verbose "$me:  target does not support btrace, returning 0" 2
+	return 0
     }
 
     # Compile a test program.
     set src { int main() { return 0; } }
     if {![gdb_simple_compile $me $src executable]} {
-        return 1
+	return 0
     }
 
     # No error message, compilation succeeded so now run it via gdb.
@@ -3826,29 +3826,29 @@  gdb_caching_proc skip_btrace_tests {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $obj
     if ![runto_main] {
-        return 1
+	return 0
     }
     # In case of an unexpected output, we return 2 as a fail value.
-    set skip_btrace_tests 2
+    set allow_btrace_tests 2
     gdb_test_multiple "record btrace" "check btrace support" {
         -re "You can't do that when your target is.*\r\n$gdb_prompt $" {
-            set skip_btrace_tests 1
+	    set allow_btrace_tests 0
         }
         -re "Target does not support branch tracing.*\r\n$gdb_prompt $" {
-            set skip_btrace_tests 1
+	    set allow_btrace_tests 0
         }
         -re "Could not enable branch tracing.*\r\n$gdb_prompt $" {
-            set skip_btrace_tests 1
+	    set allow_btrace_tests 0
         }
         -re "^record btrace\r\n$gdb_prompt $" {
-            set skip_btrace_tests 0
+	    set allow_btrace_tests 1
         }
     }
     gdb_exit
     remote_file build delete $obj
 
-    verbose "$me:  returning $skip_btrace_tests" 2
-    return $skip_btrace_tests
+    verbose "$me:  returning $allow_btrace_tests" 2
+    return $allow_btrace_tests
 }
 
 # Run a test on the target to see if it supports btrace pt hardware.