[PATCH] btrace: add unsupported/untested messages when skipping tests

Markus Metzger
2016-12-09T13:27:51Z

We may silently skip gdb.btrace tests if

- the target does not support record-btrace
- the target does not support TSX
- the target does not support gdbserver
- we fail to compile the test
- we fail to run to main

Add unsupported/untested messages for each of those.

CC: Luis Machado <lgustavo@codesourcery.com>

2016-12-09 Markus Metzger <markus.t.metzger@intel.com>

testsuite/
* gdb.btrace/buffer-size.exp: Add unsupported/untested message if
the test is skipped.
* gdb.btrace/data.exp: Likewise.
* gdb.btrace/delta.exp: Likewise.
* gdb.btrace/dlopen.exp: Likewise.
* gdb.btrace/enable-running.exp: Likewise.
* gdb.btrace/enable.exp: Likewise.
* gdb.btrace/exception.exp: Likewise.
* gdb.btrace/function_call_history.exp: Likewise.
* gdb.btrace/gcore.exp: Likewise.
* gdb.btrace/instruction_history.exp: Likewise.
* gdb.btrace/multi-thread-step.exp: Likewise.
* gdb.btrace/nohist.exp: Likewise.
* gdb.btrace/non-stop.exp: Likewise.
* gdb.btrace/reconnect.exp: Likewise.
* gdb.btrace/record_goto-step.exp: Likewise.
* gdb.btrace/record_goto.exp: Likewise.
* gdb.btrace/rn-dl-bind.exp: Likewise.
* gdb.btrace/segv.exp: Likewise.
* gdb.btrace/step.exp: Likewise.
* gdb.btrace/stepi.exp: Likewise.
* gdb.btrace/tailcall-only.exp: Likewise.
* gdb.btrace/tailcall.exp: Likewise.
* gdb.btrace/tsx.exp: Likewise.
* gdb.btrace/unknown_functions.exp: Likewise.
* gdb.btrace/vdso.exp: Likewise.
---
gdb/testsuite/gdb.btrace/buffer-size.exp | 9 ++++++---
gdb/testsuite/gdb.btrace/data.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/delta.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/dlopen.exp | 17 +++++++++++++----
gdb/testsuite/gdb.btrace/enable-running.exp | 7 ++++++-
gdb/testsuite/gdb.btrace/enable.exp | 16 +++++++++++++---
gdb/testsuite/gdb.btrace/exception.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/function_call_history.exp | 11 ++++++++---
gdb/testsuite/gdb.btrace/gcore.exp | 9 ++++++---
gdb/testsuite/gdb.btrace/instruction_history.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/multi-thread-step.exp | 9 ++++++---
gdb/testsuite/gdb.btrace/nohist.exp | 9 ++++++---
gdb/testsuite/gdb.btrace/non-stop.exp | 10 ++++++----
gdb/testsuite/gdb.btrace/reconnect.exp | 11 +++++++++--
gdb/testsuite/gdb.btrace/record_goto-step.exp | 10 ++++++----
gdb/testsuite/gdb.btrace/record_goto.exp | 11 ++++++++---
gdb/testsuite/gdb.btrace/rn-dl-bind.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/segv.exp | 9 ++++++---
gdb/testsuite/gdb.btrace/step.exp | 10 ++++++----
gdb/testsuite/gdb.btrace/stepi.exp | 15 +++++++++------
gdb/testsuite/gdb.btrace/tailcall-only.exp | 11 ++++++++---
gdb/testsuite/gdb.btrace/tailcall.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/tsx.exp | 15 ++++++++++++---
gdb/testsuite/gdb.btrace/unknown_functions.exp | 10 +++++++---
gdb/testsuite/gdb.btrace/vdso.exp | 10 +++++++---
25 files changed, 190 insertions(+), 79 deletions(-)

diff --git a/gdb/testsuite/gdb.btrace/buffer-size.exp b/gdb/testsuite/gdb.btrace/buffer-size.exp
index 2f19bf1..8708b12 100644
--- a/gdb/testsuite/gdb.btrace/buffer-size.exp
+++ b/gdb/testsuite/gdb.btrace/buffer-size.exp
@@ -17,16 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile record_goto.c
if [prepare_for_testing $testfile.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/data.exp b/gdb/testsuite/gdb.btrace/data.exp
index f39b24f..19b7cd5 100644
--- a/gdb/testsuite/gdb.btrace/data.exp
+++ b/gdb/testsuite/gdb.btrace/data.exp
@@ -17,15 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if [prepare_for_testing $testfile.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/delta.exp b/gdb/testsuite/gdb.btrace/delta.exp
index c9dbf38..9e9ad78 100644
--- a/gdb/testsuite/gdb.btrace/delta.exp
+++ b/gdb/testsuite/gdb.btrace/delta.exp
@@ -17,15 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile record_goto.c
if [prepare_for_testing delta.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/dlopen.exp b/gdb/testsuite/gdb.btrace/dlopen.exp
index 1e5b4f1..1fdc9b7 100644
--- a/gdb/testsuite/gdb.btrace/dlopen.exp
+++ b/gdb/testsuite/gdb.btrace/dlopen.exp
@@ -15,8 +15,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-if { [skip_btrace_tests] } { return -1 }
-if { [skip_shlib_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}
+
+if { [skip_shlib_tests] } {
+ unsupported "target does not support shared library tests"
+ return -1
+}

standard_testfile

@@ -26,17 +33,19 @@ set binfile_lib [standard_output_file $basename_lib.so]

if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
[list additional_flags=-fPIC]] != "" } {
- untested "failed to compile shared library"
+ untested "failed to compile $srcfile_lib"
return -1
}

if { [prepare_for_testing $testfile.exp $testfile $srcfile \
[list additional_flags=-DDSO_NAME=\"$binfile_lib\" libs=-ldl]] } {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
- return 0
+ untested "failed to run to main"
+ return -1
}

# Trace the test function
diff --git a/gdb/testsuite/gdb.btrace/enable-running.exp b/gdb/testsuite/gdb.btrace/enable-running.exp
index c5f7fa7..5c8f93e 100644
--- a/gdb/testsuite/gdb.btrace/enable-running.exp
+++ b/gdb/testsuite/gdb.btrace/enable-running.exp
@@ -15,10 +15,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

standard_testfile
if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
+ untested "failed to compile $srcfile"
return -1
}
clean_restart $testfile
@@ -27,6 +31,7 @@ clean_restart $testfile
gdb_test_no_output "set non-stop on"

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index fd63006..29d6b47 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -17,8 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

# start fresh - without an executable
gdb_exit
@@ -35,12 +37,15 @@ gdb_test "record function-call-history" "No record target is currently active\\.
gdb_test "record instruction-history" "No record target is currently active\\..*" "record instruction-history without target"
gdb_test "info record" "No record target is currently active\\." "info record without target"

-# start inferior
+
standard_testfile
if [prepare_for_testing $testfile.exp $testfile {} {debug}] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

@@ -75,23 +80,28 @@ gdb_test "continue" ".*Inferior.*exited.*" "continue to end"
# otherwise rerun twice, target should be automatically disabled
load_lib gdbserver-support.exp
if [skip_gdbserver_tests] {
+ unsupported "target does not support gdbserver"
return 0
}
clean_restart $testfile
if ![runto_main] {
+ untested "failed to run to main"
return -1
}
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

# make sure record-btrace can be enabled after re-run
clean_restart $testfile
if ![runto_main] {
+ untested "failed to run to main"
return -1
}
gdb_test_no_output "record btrace"
if ![runto_main] {
+ untested "failed to run to main"
return -1
}
gdb_test_no_output "record btrace" "enable after re-run"
diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp
index 4462d04..1451a0d 100755
--- a/gdb/testsuite/gdb.btrace/exception.exp
+++ b/gdb/testsuite/gdb.btrace/exception.exp
@@ -17,15 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile exception.cc
if [prepare_for_testing $testfile.exp $testfile $srcfile {c++ debug}] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/function_call_history.exp b/gdb/testsuite/gdb.btrace/function_call_history.exp
index 7d1e4049..05df5fa 100644
--- a/gdb/testsuite/gdb.btrace/function_call_history.exp
+++ b/gdb/testsuite/gdb.btrace/function_call_history.exp
@@ -17,15 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if [prepare_for_testing function_call_history.exp $testfile {} {debug}] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

@@ -226,6 +230,7 @@ gdb_test "record function-call-history /c 21, +11" [multi_line \

# make sure we can handle incomplete trace with respect to indentation
if ![runto_main] {
+ untested "failed to run to main"
return -1
}
# navigate to the fib in line 24 above
diff --git a/gdb/testsuite/gdb.btrace/gcore.exp b/gdb/testsuite/gdb.btrace/gcore.exp
index 3eef2a1..499497d 100644
--- a/gdb/testsuite/gdb.btrace/gcore.exp
+++ b/gdb/testsuite/gdb.btrace/gcore.exp
@@ -17,16 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile record_goto.c
if [prepare_for_testing gcore.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/instruction_history.exp b/gdb/testsuite/gdb.btrace/instruction_history.exp
index 58ae770..f53acd3 100644
--- a/gdb/testsuite/gdb.btrace/instruction_history.exp
+++ b/gdb/testsuite/gdb.btrace/instruction_history.exp
@@ -17,15 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# compile and run to main
standard_testfile .c .S
if [prepare_for_testing $testfile.exp $testfile "$srcfile $srcfile2" {debug}] {
+ untested "failed to compile $srcfile $srcfile2"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
index cc37f5f..c5fc6d0 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -17,17 +17,20 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
+ untested "failed to compile $srcfile"
return -1
}
clean_restart $testfile

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
index b309218..568c364 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -17,16 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile record_goto.c
if [prepare_for_testing nohist.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 0d5cbe2..9a0e121 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -15,13 +15,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
-
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" "$binfile" executable {debug}] != "" } {
+ untested "failed to compile $srcfile"
return -1
}
clean_restart $testfile
@@ -29,6 +30,7 @@ clean_restart $testfile
gdb_test_no_output "set non-stop on"

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp
index 485a4df..6cf480d 100644
--- a/gdb/testsuite/gdb.btrace/reconnect.exp
+++ b/gdb/testsuite/gdb.btrace/reconnect.exp
@@ -19,11 +19,18 @@

load_lib gdbserver-support.exp

-if { [skip_btrace_tests] } { return -1 }
-if { [skip_gdbserver_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}
+if { [skip_gdbserver_tests] } {
+ unsupported "target does not support gdbserver"
+ return -1
+}

standard_testfile
if [prepare_for_testing $testfile.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/record_goto-step.exp b/gdb/testsuite/gdb.btrace/record_goto-step.exp
index 1d0be5c..4e21608 100644
--- a/gdb/testsuite/gdb.btrace/record_goto-step.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto-step.exp
@@ -17,17 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

standard_testfile record_goto.c
-
-# start inferior
if [prepare_for_testing record_goto-step.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index 7df33bc..e024d09 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -17,8 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

# 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
@@ -40,14 +42,17 @@ if [info exists COMPILE] {
standard_testfile i686-record_goto.S
}
} else {
- verbose "Skipping ${testfile}."
+ unsupported "target architecture not supported"
return -1
}

if [prepare_for_testing record_goto.exp $testfile $srcfile $opts] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
index 0f92975..dcd04a7 100644
--- a/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
+++ b/gdb/testsuite/gdb.btrace/rn-dl-bind.exp
@@ -21,15 +21,19 @@
# Test that we can reverse-next over the dynamic linker's symbol
# lookup code.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if [prepare_for_testing $testfile.exp $testfile $srcfile {c++ debug}] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/segv.exp b/gdb/testsuite/gdb.btrace/segv.exp
index bc6fd3a..2a4418d 100644
--- a/gdb/testsuite/gdb.btrace/segv.exp
+++ b/gdb/testsuite/gdb.btrace/segv.exp
@@ -17,15 +17,18 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if [prepare_for_testing $testfile.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
index 1122ff1..e9afe99 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -17,17 +17,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

standard_testfile record_goto.c
-
-# start inferior
if [prepare_for_testing step.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index b21e4e5..17050ba 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -17,8 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

# This test is stepping on instruction level. To guarantee that we always
# get the same execution trace, we use an assembly source file.
@@ -38,21 +40,22 @@ if [info exists COMPILE] {
standard_testfile i686-record_goto.S
}
} else {
- verbose "Skipping ${testfile}."
+ unsupported "target architecture not supported"
return -1
}

-# start inferior
if [prepare_for_testing stepi.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}

-global gdb_prompt
-
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

+global gdb_prompt
+
proc check_replay_at { insn } {
gdb_test "info record" [multi_line \
"Active record target: record-btrace" \
diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
index 494e2e8..acffa95 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -20,8 +20,10 @@
# calls. This used to cause a crash in get_frame_type.
#

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

# This test requires the compiler to generate a tail call. To guarantee that
# we always get one, we use an assembly source file.
@@ -42,14 +44,17 @@ if [info exists COMPILE] {
standard_testfile i686-tailcall-only.S
}
} else {
- verbose "Skipping ${testfile}."
+ unsupported "target architecture not supported"
return -1
}

if [prepare_for_testing tailcall-only.exp $testfile $srcfile $opts] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
index bc8afc4..7a3d275 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -17,8 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

# This test requires the compiler to generate a tail call. To guarantee that
# we always get one, we use an assembly source file.
@@ -39,14 +41,16 @@ if [info exists COMPILE] {
standard_testfile i686-tailcall.S
}
} else {
- verbose "Skipping ${testfile}."
+ unsupported "target architecture not supported"
return -1
}

if [prepare_for_testing tailcall.exp $testfile $srcfile $opts] {
+ untested "failed to compile $srcfile"
return -1
}
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/tsx.exp b/gdb/testsuite/gdb.btrace/tsx.exp
index e501b3a..cd53e0b 100644
--- a/gdb/testsuite/gdb.btrace/tsx.exp
+++ b/gdb/testsuite/gdb.btrace/tsx.exp
@@ -15,15 +15,24 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-if { [skip_btrace_pt_tests] } { return -1 }
-if { [skip_tsx_tests] } { return -1 }
+if { [skip_btrace_pt_tests] } {
+ unsupported "target does not support PT"
+ return -1
+}
+
+if { [skip_tsx_tests] } {
+ unsupported "target does not support TSX"
+ return -1
+}

-# compile and run to main
standard_testfile .c x86-tsx.S
if [prepare_for_testing tsx.exp $testfile "$srcfile $srcfile2" {debug}] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/unknown_functions.exp b/gdb/testsuite/gdb.btrace/unknown_functions.exp
index 9f2d623..b056d20 100644
--- a/gdb/testsuite/gdb.btrace/unknown_functions.exp
+++ b/gdb/testsuite/gdb.btrace/unknown_functions.exp
@@ -17,18 +17,22 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile

# discard local symbols
set ldflags "additional_flags=-Wl,-x"
if [prepare_for_testing $testfile.exp $testfile $srcfile $ldflags] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto test] {
+ untested "failed to run to main"
return -1
}

diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
index 3d99cbb..a1c7407 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -20,15 +20,19 @@
#
# Test that we can access the vdso memory during replay for stepping.

-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}

-# start inferior
standard_testfile
if [prepare_for_testing $testfile.exp $testfile $srcfile] {
+ untested "failed to compile $srcfile"
return -1
}
+
if ![runto_main] {
+ untested "failed to run to main"
return -1
}

--
1.8.3.1