diff options
| author | Daniel Jacobowitz <drow@false.org> | 2008-03-23 17:29:34 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2008-03-23 17:29:34 +0000 |
| commit | 12f4afab79d6b54e89df93df342e1fe6009bd2cd (patch) | |
| tree | 34f688e1bb4cf80ff06a473841d94f8b1aecc083 | |
| parent | 6208b47d6c2552d1dd81d85b8b8ce350ea9fd09e (diff) | |
| download | gdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.zip gdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.tar.gz gdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.tar.bz2 | |
Revert 2008-03-21 changes.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota2.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota3.exp | 2 | ||||
| -rw-r--r-- | gdb/top.c | 26 |
5 files changed, 16 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 42c4ea0..ed25beb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-03-23 Daniel Jacobowitz <dan@codesourcery.com> + + PR gdb/544 + * top.c: Revert 2008-03-21 changes. + 2008-03-23 Vladimir Prus <vladimir@codesourcery.com> * thread.c (make_cleanup_restore_current_thread): Make it diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5df1fb3..b754c23 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 2dd9f4b..4cf6b71 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -205,10 +205,13 @@ gdb_expect { # 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)" } } diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index 7b7e9f9..c2d6168 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -208,6 +208,8 @@ gdb_expect { # test: # annotate-quit # +# This test sometimes fails, but not reproducibly. See gdb/544. +# send_gdb "\003" gdb_expect_list "annotate-quit" "$gdb_prompt$" { "\r\n\032\032error-begin\r\n" @@ -921,7 +921,7 @@ gdb_rl_operate_and_get_next_completion (void) 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; @@ -956,29 +956,6 @@ gdb_rl_operate_and_get_next (int count, int key) 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 -} - /* Read one line from the command input stream `instream' into the local static buffer `linebuffer' (whose current length @@ -1604,7 +1581,6 @@ init_main (void) 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. */ |