FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix testing gdb.rust/modules.exp against gdbserver

Browse source 
Currently several tests in 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.
This commit is contained in:
Pedro Alves 2017-11-16 18:07:41 +00:00
parent d723696126
commit ea04e54ca8
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
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.
2017-11-16 Pedro Alves <palves@redhat.com>
* gdb.server/reconnect-ctrl-c.c: New file.

18
gdb/testsuite/gdb.rust/modules.exp
View file

@ -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>> \\("