diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/interact.exp | 48 | ||||
| -rw-r--r-- | gdb/top.c | 2 |
4 files changed, 58 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a23aab9..e8ba178 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-01-13 Joel Brobecker <brobecker@adacore.com> + * top.c (input_from_terminal_p): Restrict the use of interactive_mode + to the case where instream is stdin. + +2011-01-13 Joel Brobecker <brobecker@adacore.com> + * ia64-tdep.h (struct regcache): Forward declare. (struct ia64_infcall_ops): New struct type. (struct gdbarch_tdep): New fields "find_global_pointer_from_solib" diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f6577c7..8926527 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-01-13 Joel Brobecker <brobecker@adacore.com> + + * gdb.base/interact.exp: New testcase. + 2011-01-12 Tom Tromey <tromey@redhat.com> * gdb.mi/gdb2549.exp: Update for error message changes. diff --git a/gdb/testsuite/gdb.base/interact.exp b/gdb/testsuite/gdb.base/interact.exp new file mode 100644 index 0000000..1f15fd8 --- /dev/null +++ b/gdb/testsuite/gdb.base/interact.exp @@ -0,0 +1,48 @@ +# Copyright 2011 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Create a GDB script that we can source. The script needs to generate +# some output, to allow us to verify that it is executed properly. +set fd [open "zzz-gdbscript" "w"] +puts $fd "print 1" +puts $fd "print 2" +close $fd + +# The expected output from the script... +set script_output "\\$\[0-9\]+ = 1\[\r\n\]+\\$\[0-9\]+ = 2.*" + +# Start a fresh GDB. We don't need an executable for this test, so +# nothing else to do in terms of testcase setup. +gdb_exit +gdb_start + +# Test sourcing of the script with interactive mode `auto' +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" + +# Test sourcing of the script with interactive mode `on' +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" + +# Test sourcing of the script with interactive mode `of' +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" + @@ -1292,7 +1292,7 @@ show_interactive_mode (struct ui_file *file, int from_tty, int input_from_terminal_p (void) { - if (interactive_mode != AUTO_BOOLEAN_AUTO) + if (interactive_mode != AUTO_BOOLEAN_AUTO && instream == stdin) return interactive_mode == AUTO_BOOLEAN_TRUE; if (batch_flag) |