[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 6a517905066612360854eb47a72ea3bc0c82a864

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 6a517905066612360854eb47a72ea3bc0c82a864
Author: Guillaume Rousse <Guillaume.Rousse at inria.fr>
Date:   Sun Nov 7 20:17:28 2010 +0100

    test perldoc options completion

diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index 7585897..dc1c79c 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -11,25 +11,6 @@ proc teardown {} {
 setup
 
 
-set test "perldoc should complete options"
-set cmd "perldoc -"
-send "$cmd\t"
-expect -ex "$cmd"
-# We can't anchor on $, simulate typing a magical string instead.
-set endguard "Magic End Guard"
-send "$endguard"
-expect {
-    # NOTE: Expected failure: After switching to pure perl perldoc completion,
-    #       the completion of options has disappeared.  See commit 07b7ddd1d
-    #       and Alioth #312800
-    -re "^$endguard$" { xfail "$test" }
-    -re "-h.*$endguard$" { pass "$test" }
-}
-
-
-sync_after_int
-
-
 set test "perldoc should complete word containing colons"
 set cmd "perldoc File::"
 send "$cmd\t"
@@ -47,5 +28,14 @@ expect {
 
 sync_after_int
 
+set test "- should complete options"
+set options {
+    -h -v -t -u -m -l -F -X -f -q
+}
+assert_complete $options "perldoc -"
+
+
+sync_after_int
+
 
 teardown

-- 
bash-completion