From 3d230f71746e0b33376f8b9bca914cc5d980997a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 12 Jan 2015 17:10:06 +0000 Subject: [PATCH] gdb.python/py-prompt.exp: restore GDBFLAGS The previous change to py-prompt.exp made it return without restoring GDBFLAGS, resulting in breaking the following tests: $ make check RUNTESTFLAGS="--target_board=native-gdbserver --directory=gdb.python" ... Running src/gdb/testsuite/gdb.python/py-prompt.exp ... Running src/gdb/testsuite/gdb.python/py-section-script.exp ... ERROR: (timeout) GDB never initialized after 10 seconds. ERROR: no fileid for gdbuild ERROR: Couldn't send python print ('test') to GDB. ERROR: no fileid for gdbuild ERROR: Couldn't send python print (sys.version_info[0]) to GDB. ERROR: no fileid for gdbuild ERROR: Couldn't send python print (sys.version_info[1]) to GDB. ERROR: no fileid for gdbuild ERROR: no fileid for gdbuild ... gdb/testsuite/ 2015-01-12 Pedro Alves * gdb.python/py-prompt.exp: When the board can't spawn for attach, restore GDBFLAGS before returning. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.python/py-prompt.exp | 1 + 2 files changed, 6 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7343d038e68..db1f521b2a3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-01-12 Pedro Alves + + * gdb.python/py-prompt.exp: When the board can't spawn for attach, + restore GDBFLAGS before returning. + 2015-01-12 Jan Kratochvil * gdb.python/py-frame.exp (test Frame.read_register(rip)): Use diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp index 55f0f5966eb..0f7a3a4bb11 100644 --- a/gdb/testsuite/gdb.python/py-prompt.exp +++ b/gdb/testsuite/gdb.python/py-prompt.exp @@ -76,6 +76,7 @@ gdb_test "python print (\"'\" + str(p\[0\]) + \"'\")" "'$gdb_prompt_fail '" \ gdb_exit if {![can_spawn_for_attach]} { + set GDBFLAGS $saved_gdbflags return 0 } -- 2.30.2