Add copyright headers.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / readline.exp

diff --git a/gdb/testsuite/gdb.base/readline.exp b/gdb/testsuite/gdb.base/readline.exp
index 2ad8580c84a15fd9e83346d1d6793c8258cecab0..ef7fa130c80688c71f406fc82f663eab9cbdc442 100644 (file)
--- a/gdb/testsuite/gdb.base/readline.exp
+++ b/gdb/testsuite/gdb.base/readline.exp
@@ -1,21 +1,17 @@
-# Copyright 2002, 2003, 2007 Free Software Foundation, Inc.
+# Copyright 2002-2014 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 2 of the License, or
+# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Tom Tromey <tromey@redhat.com>
 
@@ -139,37 +135,21 @@ proc operate_and_get_next {name args} {
     set count [expr {$count + 2}]
   }
 
-  return 1
-}
-
-
-if $tracelevel {
-  strace $tracelevel
-}
+  # Match the prompt so the next test starts at the right place.
+  gdb_test "" ".*" "$name - final prompt"
 
-# Don't let a .inputrc file or an existing setting of INPUTRC mess up
-# the test results.  Even if /dev/null doesn't exist on the particular
-# platform, the readline library will use the default setting just by
-# failing to open the file.  OTOH, opening /dev/null successfully will
-# also result in the default settings being used since nothing will be
-# read from this file.
-global env
-if [info exists env(INPUTRC)] {
-    set old_inputrc $env(INPUTRC)
+  return 1
 }
-set env(INPUTRC) "/dev/null"
 
-# The arrow key test relies on the standard VT100 bindings, so make
-# sure that an appropriate terminal is selected.  The same bug
-# doesn't show up if we use ^P / ^N instead.
-if [info exists env(TERM)] {
-    set old_term $env(TERM)
-}
-set env(TERM) "vt100"
 
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 
+if { ![readline_is_used] } {
+    unsupported "readline isn't used."
+    return -1
+}
+
 set oldtimeout1 $timeout
 set timeout 30
 
@@ -222,11 +202,6 @@ operate_and_get_next "Simple operate-and-get-next" \
 
 
 # Restore globals modified in this test...
-if [info exists old_inputrc] {
-    set env(INPUTRC) $old_inputrc
-} else {
-    unset env(INPUTRC)
-}
 if [info exists old_gdbhistfile] {
     set env(GDBHISTFILE) $old_gdbhistfile
 } else {