Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Pedro Alves <palves@redhat.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH] Fix testing gdb.rust/modules.exp against gdbserver
Date: Thu, 16 Nov 2017 17:23:00 -0000	[thread overview]
Message-ID: <1510852993-26330-1-git-send-email-palves@redhat.com> (raw)

Currently several testsin gdb.rust/modules.exp fail with
 --target_board=native-gdbserver:

 Running src/gdb/testsuite/gdb.rust/modules.exp ...
 FAIL: gdb.rust/modules.exp: call f3()
 FAIL: gdb.rust/modules.exp: call self::f2()
 FAIL: gdb.rust/modules.exp: call self::super::f2()
 FAIL: gdb.rust/modules.exp: call super::f2()
 FAIL: gdb.rust/modules.exp: call self::super::super::f2()
 FAIL: gdb.rust/modules.exp: call super::super::f2()
 FAIL: gdb.rust/modules.exp: call ::f2()
 FAIL: gdb.rust/modules.exp: call extern modules::mod1::f2()

This is because these tests rely on matching inferior output.
However, when testing with gdbserver, inferior output goes to a
separate terminal instead of to gdb's terminal, and so gdb_test won't
cut it, as that is only reading from gdb's pty/gdb_spawn_id:

 (gdb) call f3()
 (gdb) FAIL: gdb.rust/modules.exp: call f3()
 call self::f2()
 (gdb) FAIL: gdb.rust/modules.exp: call self::f2()

Fix this by using gdb_test_stdio instead, which handles output coming
out of gdbserver's pty.

Also, skip the tests if the target/board doesn't support inferior I/O
at all.

gdb/ChangeLog:
2017-11-16  Pedro Alves  <palves@redhat.com>

	* gdb.rust/modules.exp: Skip tests that rely on inferior I/O if
	gdb,noinferiorio is set, and use gdb_test_stdio otherwise.
---
 gdb/testsuite/gdb.rust/modules.exp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp
index a2a5804..eda981d 100644
--- a/gdb/testsuite/gdb.rust/modules.exp
+++ b/gdb/testsuite/gdb.rust/modules.exp
@@ -35,16 +35,18 @@ if {![runto ${srcfile}:$line]} {
 # https://github.com/rust-lang/rust/issues/33121
 # gdb_test "call f2()" "lambda f2"
 
-gdb_test "call f3()" "mod1::inner::innest::f3"
-gdb_test "call self::f2()" "mod1::inner::innest::f2"
-gdb_test "call self::super::f2()" "mod1::inner::f2"
-gdb_test "call super::f2()" "mod1::inner::f2"
-gdb_test "call self::super::super::f2()" "mod1::f2"
-gdb_test "call super::super::f2()" "mod1::f2"
-gdb_test "call ::f2()" "::f2"
+if ![target_info exists gdb,noinferiorio] {
+    gdb_test_stdio "call f3()" "mod1::inner::innest::f3"
+    gdb_test_stdio "call self::f2()" "mod1::inner::innest::f2"
+    gdb_test_stdio "call self::super::f2()" "mod1::inner::f2"
+    gdb_test_stdio "call super::f2()" "mod1::inner::f2"
+    gdb_test_stdio "call self::super::super::f2()" "mod1::f2"
+    gdb_test_stdio "call super::super::f2()" "mod1::f2"
+    gdb_test_stdio "call ::f2()" "::f2"
+    gdb_test_stdio "call extern modules::mod1::f2()" "mod1::f2"
+}
 gdb_test "call super::super::super::f2()" \
     "Too many super:: uses from 'modules::mod1::inner::innest'"
-gdb_test "call extern modules::mod1::f2()" "mod1::f2"
 
 gdb_test_sequence "ptype ::Generic::<::Generic<::Type> >" "" {
     "type = struct modules::Generic<modules::Generic<modules::Type>> \\("
-- 
2.5.5


             reply	other threads:[~2017-11-16 17:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-16 17:23 Pedro Alves [this message]
2017-11-16 17:51 ` Tom Tromey
2017-11-16 18:09   ` Pedro Alves

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=1510852993-26330-1-git-send-email-palves@redhat.com \
    --to=palves@redhat.com \
    --cc=gdb-patches@sourceware.org \
    --cc=tom@tromey.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