From e0a8643d2cea10858f30a8378f6cab4472dee0f9 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 22 Jan 2023 10:01:05 -0700
Subject: [PATCH] Add unsupported calls where needed

A number of tests will exit early without saying why.  This patch adds
"unsupported" at spots like this that I could readily find.

There are definitely more of these; for example dw2-ranges.exp fails
silently because a compilation fails.  I didn't attempt to address
these as that is a much larger task.
---
 gdb/testsuite/gdb.arch/pa-nullify.exp                | 2 +-
 gdb/testsuite/gdb.arch/powerpc-trap.exp              | 2 +-
 gdb/testsuite/gdb.base/remote.exp                    | 1 +
 gdb/testsuite/gdb.base/solib-disc.exp                | 1 +
 gdb/testsuite/gdb.dwarf2/implptr.exp                 | 1 +
 gdb/testsuite/gdb.server/extended-remote-restart.exp | 2 ++
 gdb/testsuite/gdb.threads/reconnect-signal.exp       | 1 +
 gdb/testsuite/gdb.trace/stap-trace.exp               | 1 +
 8 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index 4686ed29209..285047cc95f 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -26,7 +26,7 @@ switch -glob -- [istarget] {
 	set testfile "pa64-nullify"
     }
     "*" {
-        verbose "Skipping hppa nullification tests."
+        unsupported "Skipping hppa nullification tests."
         return
     }
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-trap.exp b/gdb/testsuite/gdb.arch/powerpc-trap.exp
index a1739f33c43..f197b1ab56b 100644
--- a/gdb/testsuite/gdb.arch/powerpc-trap.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-trap.exp
@@ -29,7 +29,7 @@ if { [istarget powerpc-*] } {
    # with the source file powerpc64-trap.s.
    set expected_traps 5
 } else {
-    verbose "Skipping ${gdb_test_file_name}."
+    unsupported "Skipping powerpc-specific tests"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index 1ce27e8a958..a1c9973b802 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -16,6 +16,7 @@
 # Test only on boards that actually use the remote protocol.
 if {[target_info gdb_protocol] != "remote"
     && [target_info gdb_protocol] != "extended-remote"} {
+    unsupported "requires remote protocol"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp
index 0e3acfce954..46b11dc768b 100644
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -19,6 +19,7 @@ require allow_shlib_tests
 
 set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
+    unsupported "requires gdbserver reconnect"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp
index a309994ecff..70d86ddf19a 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr.exp
@@ -29,6 +29,7 @@ if [info exists COMPILE] {
     lappend opts debug optimize=-O2
 } elseif {![is_x86_like_target]} {
     # This test can only be run on x86 targets.
+    unsupported "needs x86-like target"
     return 0  
 }
 
diff --git a/gdb/testsuite/gdb.server/extended-remote-restart.exp b/gdb/testsuite/gdb.server/extended-remote-restart.exp
index 8d3b384f348..b9eb2a69573 100644
--- a/gdb/testsuite/gdb.server/extended-remote-restart.exp
+++ b/gdb/testsuite/gdb.server/extended-remote-restart.exp
@@ -30,6 +30,7 @@
 
 # This test is only for extended remote targets.
 if {[target_info gdb_protocol] != "extended-remote"} {
+    unsupported "requires extended-remote"
     return
 }
 
@@ -40,6 +41,7 @@ require {is_any_target "*-*-linux*" "*-*-openbsd*"}
 # And we need to be able to reconnect to gdbserver.
 set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
+    unsupported "requires gdbserver reconnect"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index bec68e62c91..dbc7d7d7806 100644
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -17,6 +17,7 @@
 
 set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
+    unsupported "requires gdbserver reconnect"
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index 34122737d20..39c2fa02ca1 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -115,6 +115,7 @@ if { ![runto_main] } {
 
 if { ![gdb_target_supports_trace] } {
     # Test cannot run on this target.
+    unsupported "test requires trace"
     return 1
 }
 
-- 
2.30.2