public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Luc Michel <lmichel@kalray.eu>
To: libstdc++@gcc.gnu.org, Jonathan Wakely <jwakely@redhat.com>
Cc: Luc Michel <lmichel@kalray.eu>, Marc Poulhies <mpoulhies@kalrayinc.com>
Subject: [PATCH v2] libstdc++: Fix testsuite for skipping gdb tests on remote/non-native target
Date: Mon,  9 Aug 2021 13:47:08 +0200	[thread overview]
Message-ID: <20210809114708.11647-1-lmichel@kalray.eu> (raw)

This fixes an incorrect invocation of gdb on remote targets where
DejaGNU would try to run host's gdb in remote target simulator.
gdb-test skips the testing when target is remote or non native but the
gdb version check function does not.

Co-authored-by: Marc Poulhies <mpoulhies@kalrayinc.com>
Suggested-by: Jonathan Wakely <jwakely@redhat.com>
Signed-off-by: Luc Michel <lmichel@kalray.eu>
---
Hi

Marc has now left Kalray so I'll carry on with this patch. I applied
Jonathan's suggestion. Let me know if things are OK.

v2 changes:
    * Put the check in gdb_version_check/gdb_version_check_xmethods
      instead of gdb_batch_check [Jonathan]

Thanks.

Luc
---
 libstdc++-v3/testsuite/lib/gdb-test.exp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp
index af20c85e5a0..f993355c2b4 100644
--- a/libstdc++-v3/testsuite/lib/gdb-test.exp
+++ b/libstdc++-v3/testsuite/lib/gdb-test.exp
@@ -278,18 +278,22 @@ proc gdb_batch_check {command pattern} {
 # require gdb 7.3, but we don't want to test versions, so instead we
 # check for the python "lookup_global_symbol" method, which is in 7.3
 # but not earlier versions.
 # Return 1 if the version is ok, 0 otherwise.
 proc gdb_version_check {} {
+    if { ![isnative] || [is_remote target] } { return 0 }
+
     return [gdb_batch_check "python print(gdb.lookup_global_symbol)" \
 	      "<built-in function lookup_global_symbol>"]
 }
 
 # Check for a version of gdb which supports xmethod tests.  It is done
 # in a manner similar to the check for a version of gdb which supports the
 # pretty-printer tests below.
 proc gdb_version_check_xmethods {} {
+    if { ![isnative] || [is_remote target] } { return 0 }
+
     return [gdb_batch_check \
 	      "python import gdb.xmethod; print(gdb.xmethod.XMethod)" \
 	      "<class 'gdb\\.xmethod\\.XMethod'>"]
 }
 
-- 
2.17.1


             reply	other threads:[~2021-08-09 11:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-09 11:47 Luc Michel [this message]
2021-08-17 15:55 ` Jonathan Wakely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210809114708.11647-1-lmichel@kalray.eu \
    --to=lmichel@kalray.eu \
    --cc=jwakely@redhat.com \
    --cc=libstdc++@gcc.gnu.org \
    --cc=mpoulhies@kalrayinc.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).