[binutils-gdb] gdb.python/py-prompt.exp: restore GDBFLAGS

[Pedro Alves <palves at sourceware dot org>]

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

commit 3d230f71746e0b33376f8b9bca914cc5d980997a
Author: Pedro Alves <palves@redhat.com>
Date:   Mon Jan 12 17:10:06 2015 +0000

    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  <palves@redhat.com>
    
    	* gdb.python/py-prompt.exp: When the board can't spawn for attach,
    	restore GDBFLAGS before returning.

Diff:
---
 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 7343d03..db1f521 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-12  Pedro Alves  <palves@redhat.com>
+
+	* gdb.python/py-prompt.exp: When the board can't spawn for attach,
+	restore GDBFLAGS before returning.
+
 2015-01-12  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* 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 55f0f59..0f7a3a4 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
 }