[binutils-gdb] Tighten remote check in gdb.base/argv0-symlink.exp

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=30440677f3d0cdd2085bea40496774ffa24f6bb1

commit 30440677f3d0cdd2085bea40496774ffa24f6bb1
Author: Pedro Alves <palves@redhat.com>
Date:   Thu Oct 12 19:16:47 2017 +0100

    Tighten remote check in gdb.base/argv0-symlink.exp
    
    Check for gdbserver instead of dejagnu remote.  Unlike what the
    comment says, the test actually fails with target remote + gdbserver
    (it does pass with extended-remote).  The result is:
    
     FAIL -> KFAIL with --target_board=native-gdbserver
     KPASS -> PASS with --target_board=native-extended-gdbserver
    
    gdb/testsuite/ChangeLog:
    2017-10-12  Pedro Alves  <palves@redhat.com>
    	    Simon Marchi  <simon.marchi@polymtl.ca>
    
    	* gdb.base/argv0-symlink.exp: kfail on remote gdbserver,
    	instead of on dejagnu remote boards.

Diff:
---
 gdb/testsuite/ChangeLog                  | 6 ++++++
 gdb/testsuite/gdb.base/argv0-symlink.exp | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0fa3afb..e6a4281 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,4 +1,10 @@
 2017-10-12  Pedro Alves  <palves@redhat.com>
+	    Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.base/argv0-symlink.exp: kfail on remote gdbserver,
+	instead of on dejagnu remote boards.
+
+2017-10-12  Pedro Alves  <palves@redhat.com>
 	    Simon Marchi <simon.marchi@polymtl.ca>
 
 	* gdb.base/inferior-died.exp: Remove is_remote and isnative
diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp
index a1248ed..efac9e0 100644
--- a/gdb/testsuite/gdb.base/argv0-symlink.exp
+++ b/gdb/testsuite/gdb.base/argv0-symlink.exp
@@ -80,8 +80,9 @@ gdb_test_no_output "set print repeats 10000"
 gdb_test_no_output "set print elements 10000"
 
 if { $has_argv0 } {
-    # gdbserver does not have this issue.
-    if ![is_remote target] {
+    # gdbserver in extended-remote mode does not have this issue.
+    # Plain remote does, however.
+    if {[target_info gdb_protocol] != "extended-remote" || ![target_is_gdbserver]} {
 	setup_kfail "*-*-*" gdb/15934
     }
     gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test