From: Tom de Vries <tdevries@suse.de>
Date: Mon, 10 Feb 2020 12:22:09 +0000 (+0100)
Subject: [gdb/testsuite] Skip multi-target.exp without gdbserver
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44f6938ead9cfadecd705dbd30fa177fac1330ad;p=binutils-gdb.git

[gdb/testsuite] Skip multi-target.exp without gdbserver

Pre-commit 919adfe840 "Move gdbserver to top level", if we build gdb with
--disable-gdbserver, and run test-case gdb.multi/multi-target.exp, we run
into:
...
(gdb) PASS: gdb.multi/multi-target.exp: continue: non-stop=off: set remote-exec file in inferior 2
spawn of  --once --multi localhost:2346 failed
ERROR: tcl error sourcing /data/gdb_versions/devel/src/gdb/testsuite/gdb.multi/multi-target.exp.
ERROR: Timeout waiting for gdbserver response.
...

Fix this by using skip_gdbserver_tests in multi-target.exp.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-02-10  Tom de Vries  <tdevries@suse.de>

	* gdb.multi/multi-target.exp: Skip if skip_gdbserver_tests.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ef439953052..20c39b12003 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-10  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.multi/multi-target.exp: Skip if skip_gdbserver_tests.
+
 2020-02-10  Maciej W. Rozycki  <macro@wdc.com>
 
 	* gdb.base/step-over-no-symbols.exp: Verify that $before_addr
diff --git a/gdb/testsuite/gdb.multi/multi-target.exp b/gdb/testsuite/gdb.multi/multi-target.exp
index 3588eb4d76e..6c727b5e3bd 100644
--- a/gdb/testsuite/gdb.multi/multi-target.exp
+++ b/gdb/testsuite/gdb.multi/multi-target.exp
@@ -17,6 +17,10 @@
 
 load_lib gdbserver-support.exp
 
+if { [skip_gdbserver_tests] } {
+    return 0
+}
+
 standard_testfile
 
 # The plain remote target can't do multiple inferiors.