From d4416accccb7be5efa8690a3e703ad91a6c02eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 1 Jan 2012 14:42:39 +0200
Subject: _filedir, _tilde: Ignore compopt stderr for direct invocations in
 unit tests.

---
 bash_completion | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'bash_completion')

diff --git a/bash_completion b/bash_completion
index da0267b9..99addfd2 100644
--- a/bash_completion
+++ b/bash_completion
@@ -590,7 +590,8 @@ _filedir()
         -n "$1" && "$1" != -d && ${#toks[@]} -lt 1 ]] && \
         toks+=( $( compgen -f -- $quoted ) )
 
-    [[ ${#toks[@]} -ne 0 ]] && compopt -o filenames
+    # 2>/dev/null for direct invocation, e.g. in the _filedir unit test
+    [[ ${#toks[@]} -ne 0 ]] && compopt -o filenames 2>/dev/null
 
     COMPREPLY+=( "${toks[@]}" )
 } # _filedir()
@@ -923,7 +924,8 @@ _tilde()
         # Try generate ~username completions
         COMPREPLY=( $( compgen -P '~' -u "${1#\~}" ) )
         result=${#COMPREPLY[@]}
-        [[ $result -gt 0 ]] && compopt -o filenames
+        # 2>/dev/null for direct invocation, e.g. in the _tilde unit test
+        [[ $result -gt 0 ]] && compopt -o filenames 2>/dev/null
     fi
     return $result
 }
-- 
cgit v1.2.1