[Bug gdb/29032] [gdb][test-case failure, taskset] FAIL: gdb.base/eof-exit.exp: with non-dump terminal: close GDB with eof (timeout)

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=29032

--- Comment #6 from Tom de Vries <vries at gcc dot gnu.org> ---
OK, let's try again:
...
diff --git a/gdb/event-top.c b/gdb/event-top.c
index b628f0397cb..8ff4846b405 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -43,6 +43,7 @@
 #include "async-event.h"
 #include "bt-utils.h"
 #include "pager.h"
+#include "termios.h"

 /* readline include files.  */
 #include "readline/readline.h"
@@ -1312,6 +1313,12 @@ gdb_setup_readline (int editing)
      one instance of readline.  */
   if (ISATTY (ui->instream) && editing && ui == main_ui)
     {
+      struct termios termios;
+      tcgetattr (fileno (ui->instream), &termios);
+      termios.c_lflag &= ~(ICANON);
+      tcsetattr (fileno (ui->instream), TCSANOW, &termios);
+      //fprintf (stderr, "Clearing ICANON on fileno %d\n", fileno
(ui->instream));
m                                                                               
+                                                                               
       /* Tell gdb that we will be using the readline library.  This
         could be overwritten by a command in .gdbinit like 'set
         editing on' or 'off'.  */
diff --git a/gdb/top.c b/gdb/top.c
index e776ac2d70e..f796d12a14e 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -57,6 +57,7 @@
 #include "gdbsupport/pathstuff.h"
 #include "cli/cli-style.h"
 #include "pager.h"
+#include "termios.h"

 /* readline include files.  */
 #include "readline/readline.h"
@@ -1774,6 +1775,15 @@ undo_terminal_modifications_before_exit (void)
 #endif
   gdb_disable_readline ();

+  if (ISATTY (current_ui->instream))
+    {
+      struct termios termios;
+      tcgetattr (fileno (current_ui->instream), &termios);
+      termios.c_lflag |= (ICANON);
+      tcsetattr (fileno (current_ui->instream), TCSANOW, &termios);
+      //fprintf (stderr, "Restoring ICANON on fileno %d\n", fileno
(current_ui->ins
tream));
+    }
+
   current_ui = saved_top_level;
 }

...

This at least passes:
- gdb.base/eof-exit.exp
- gdb.ada/mi_catch_assert.exp
- gdb.base/batch-preserve-term-settings.exp

-- 
You are receiving this mail because:
You are on the CC list for the bug.