From dd245f62f0f30403961cd71abe8730ea51ab1855 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 27 Sep 2015 13:32:12 -0700 Subject: Trailing slashes in wildcards need to match directories Fixes the wrong sense in a waccess test. --- src/fish_tests.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/fish_tests.cpp') diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp index 889dfbb8..8adf4ca3 100644 --- a/src/fish_tests.cpp +++ b/src/fish_tests.cpp @@ -1513,6 +1513,15 @@ static void test_expand() expand_test(L"/tmp/fish_expand_test/b**", 0, L"/tmp/fish_expand_test/b", L"/tmp/fish_expand_test/b/x", L"/tmp/fish_expand_test/bar", L"/tmp/fish_expand_test/bax", L"/tmp/fish_expand_test/bax/xxx", L"/tmp/fish_expand_test/baz", L"/tmp/fish_expand_test/baz/xxx", L"/tmp/fish_expand_test/baz/yyy", wnull, L"Glob did the wrong thing 4"); + + // a trailing slash should only produce directories + expand_test(L"/tmp/fish_expand_test/b*/", 0, + L"/tmp/fish_expand_test/b/", L"/tmp/fish_expand_test/baz/", L"/tmp/fish_expand_test/bax/", wnull, + L"Glob did the wrong thing 5"); + + expand_test(L"/tmp/fish_expand_test/b**/", 0, + L"/tmp/fish_expand_test/b/", L"/tmp/fish_expand_test/baz/", L"/tmp/fish_expand_test/bax/", wnull, + L"Glob did the wrong thing 6"); expand_test(L"/tmp/fish_expand_test/BA", EXPAND_FOR_COMPLETIONS, L"/tmp/fish_expand_test/bar", L"/tmp/fish_expand_test/bax/", L"/tmp/fish_expand_test/baz/", wnull, -- cgit v1.2.3