fix typo during interactive_mode check in gdb_has_a_terminal

Discovered by Pierre Muller.

gdb/ChangeLog:

        * inflow.c (gdb_has_a_terminal): Fix typo in interactive_mode
        value test.

gdb/testsuite/ChangeLog:

        * gdb.base/interact.exp: Add extra tests that verify that
        the value of the interactive-mode setting does not change
        after the script is sourced.
This commit is contained in:
Joel Brobecker 2011-01-31 03:11:40 +00:00
parent f4b54baf38
commit 6b0c4c1f05
4 changed files with 30 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2011-01-31 Joel Brobecker <brobecker@adacore.com>
* inflow.c (gdb_has_a_terminal): Fix typo in interactive_mode
value test.
2011-01-31 Yao Qi <yao@codesourcery.com>
* arm-linux-nat.c: Update calls to regcache_register_status

View File

@ -165,7 +165,7 @@ int
gdb_has_a_terminal (void)
{
if (interactive_mode != AUTO_BOOLEAN_AUTO)
return interactive_mode = AUTO_BOOLEAN_TRUE;
return interactive_mode == AUTO_BOOLEAN_TRUE;
switch (gdb_has_a_terminal_flag)
{

View File

@ -1,3 +1,9 @@
2011-01-31 Joel Brobecker <brobecker@adacore.com>
* gdb.base/interact.exp: Add extra tests that verify that
the value of the interactive-mode setting does not change
after the script is sourced.
2011-01-29 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.cp/noparam.exp: New file.

View File

@ -28,21 +28,36 @@ set script_output "\\$\[0-9\]+ = 1\[\r\n\]+\\$\[0-9\]+ = 2.*"
gdb_exit
gdb_start
# Test sourcing of the script with interactive mode `auto'
# Test sourcing of the script with interactive mode `auto'.
# Verify that evaluating the script does not cause an unexpected
# change of the interactive-mode setting.
gdb_test_no_output "set interactive-mode auto"
gdb_test "source zzz-gdbscript" "$script_output" \
"source script with interactive-mode auto"
gdb_test "print 3" "= 3" "sanity check with interactive-mode auto"
gdb_test "show interactive-mode" \
"Debugger's interactive mode is auto \\(currently .*\\)\\." \
"show interactive-mode (auto)"
# Test sourcing of the script with interactive mode `on'
# Test sourcing of the script with interactive mode `on'.
# Verify that evaluating the script does not cause an unexpected
# change of the interactive-mode setting.
gdb_test_no_output "set interactive-mode on"
gdb_test "source zzz-gdbscript" "$script_output" \
"source script with interactive-mode on"
gdb_test "print 4" "= 4" "sanity check with interactive-mode on"
gdb_test "show interactive-mode" \
"Debugger's interactive mode is on\\." \
"show interactive-mode (on)"
# Test sourcing of the script with interactive mode `of'
# Test sourcing of the script with interactive mode `off'.
# Verify that evaluating the script does not cause an unexpected
# change of the interactive-mode setting.
gdb_test_no_output "set interactive-mode off"
gdb_test "source zzz-gdbscript" "$script_output" \
"source script with interactive-mode off"
gdb_test "print 5" "= 5" "sanity check with interactive-mode off"
gdb_test "show interactive-mode" \
"Debugger's interactive mode is off\\." \
"show interactive-mode (off)"