New upstream version 2.7upstream/2.7

3 files changed, 22 insertions, 19 deletions

diff --git a/test/config/bashrc b/test/config/bashrc
index fd72b816..d16c9033 100644
--- a/test/config/bashrc
+++ b/test/config/bashrc
@@ -4,7 +4,7 @@
 set -o emacs
 	# Use bash strict mode
 set -o posix
-	# Unset `command_not_found_handle' as defined on Debian/Ubuntu, because this 
+	# Unset `command_not_found_handle' as defined on Debian/Ubuntu, because this
 	# troubles and slows down testing
 unset -f command_not_found_handle
 	# Set fixed prompt `/@'
@@ -15,12 +15,21 @@ export PS2='> '
 export INPUTRC=$SRCDIR/config/inputrc
     # When not running via cron, avoid escape junk at beginning of line from
     # readline, see e.g.  http://bugs.gentoo.org/246091
-[ "$CRON" ] || export TERM=dummy
+[ "$CRON" ] || export TERM=dumb
 	# Ensure enough columns so expect doesn't have to care about line breaks
 stty columns 150
     # Also test completions of system administrator commands, which are
     # installed via the same PATH expansion in `bash_completion.have()'
 export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
+    # ...as well as games on some systems not in PATH by default:
+export PATH=$PATH:/usr/games:/usr/local/games
+    # For clean test state, avoid sourcing user's ~/.bash_completion
+export BASH_COMPLETION_USER_FILE=/dev/null
+    # ...and avoid stuff in BASH_COMPLETION_USER_DIR overriding in-tree
+    # completions. The user dir is first in the lookup path, so this should also
+    # give precedence to the in-tree "completions" dir over other ones, e.g.
+    # the one possibly in /usr/share/bash-completion.
+export BASH_COMPLETION_USER_DIR=$(cd "$SRCDIR/.."; pwd)
 
 	# Make sure default settings are in effect
 unset -v \
@@ -34,8 +43,5 @@ unset -v \
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
 # End:
-# ex: ts=4 sw=4 et filetype=sh
+# ex: filetype=sh
diff --git a/test/config/default.exp b/test/config/default.exp
index 1eb47a2c..246499b4 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -2,20 +2,20 @@
 expect_after {
     eof {
         if {[info exists test]} {
-            fail "$test at eof" 
+            fail "$test at eof"
         } elseif {[info level] > 0} {
-            fail "[info level 1] at eof" 
+            fail "[info level 1] at eof"
         } else {
             fail "eof"
-        }   
-    }   
+        }
+    }
     timeout {
         if {[info exists test]} {
-            fail "$test at timeout" 
+            fail "$test at timeout"
         } elseif {[info level] > 0} {
-            fail "[info level 1] at timeout" 
+            fail "[info level 1] at timeout"
         } else {
-            fail "timeout" 
-        }   
-    }   
+            fail "timeout"
+        }
+    }
 }
diff --git a/test/config/inputrc b/test/config/inputrc
index 33134da6..5992491a 100644
--- a/test/config/inputrc
+++ b/test/config/inputrc
@@ -14,8 +14,5 @@ set page-completions off
 
 # Local variables:
 # mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
 # End:
-# ex: ts=4 sw=4 et filetype=sh
+# ex: filetype=sh