+2008-03-23 Daniel Jacobowitz <dan@codesourcery.com>
+
+ PR gdb/544
+ * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Revert 2008-03-21 changes.
+
2008-03-21 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.cp/annota2.exp, gdb.cp/annota3.exp: Remove KFAIL for
# test:
# annotate-quit
#
+# This test sometimes fails, but not reproducibly. See gdb/544.
+#
send_gdb "\003"
gdb_expect {
-re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \
{ pass "annotate-quit" }
+ -re "$gdb_prompt$" { kfail "gdb/544" "annotate-quit" }
-re ".*$gdb_prompt$" { fail "annotate-quit" }
timeout { fail "annotate-quit (timeout)" }
}
operate_saved_history = -1;
/* readline doesn't automatically update the display for us. */
- rl_redisplay_function ();
+ rl_redisplay ();
after_char_processing_hook = NULL;
rl_pre_input_hook = NULL;
return rl_newline (1, key);
}
-
-/* Readline 5.2 and earlier do not block SIGINT while redrawing the prompt.
- This can lead to corrupted internal state. As long as we do not require
- a newer readline version, compensate for it. */
-static void
-gdb_rl_redisplay (void)
-{
-#if HAVE_SIGPROCMASK
- sigset_t sigint_set, sigint_oset;
-
- sigemptyset (&sigint_set);
- sigemptyset (&sigint_oset);
- sigaddset (&sigint_set, SIGINT);
- sigprocmask (SIG_BLOCK, &sigint_set, &sigint_oset);
-#endif
-
- rl_redisplay ();
-
-#if HAVE_SIGPROCMASK
- sigprocmask (SIG_SETMASK, &sigint_oset, (sigset_t *)NULL);
-#endif
-}
-
\f
/* Read one line from the command input stream `instream'
into the local static buffer `linebuffer' (whose current length
rl_completer_quote_characters = get_gdb_completer_quote_characters ();
rl_readline_name = "gdb";
rl_terminal_name = getenv ("TERM");
- rl_redisplay_function = gdb_rl_redisplay;
/* The name for this defun comes from Bash, where it originated.
15 is Control-o, the same binding this function has in Bash. */