From 315bbcf5a47e3a9c6d85f2d45859b20b428e2d36 Mon Sep 17 00:00:00 2001 From: Bob Matcuk Date: Sat, 5 Nov 2022 10:03:35 -0400 Subject: [PATCH] fix windows tests --- doublestar_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doublestar_test.go b/doublestar_test.go index 9e894ef..35a791d 100644 --- a/doublestar_test.go +++ b/doublestar_test.go @@ -101,12 +101,12 @@ var matchTests = []MatchTest{ {"a/**", "a/", true, true, nil, false, false, false, 7, 7}, {"a/**", "a/b", true, true, nil, false, false, true, 7, 7}, {"a/**", "a/b/c", true, true, nil, false, false, true, 7, 7}, - {"**/c", "c", true, true, nil, true, false, true, 5, 4}, - {"**/c", "b/c", true, true, nil, true, false, true, 5, 4}, - {"**/c", "a/b/c", true, true, nil, true, false, true, 5, 4}, - {"**/c", "a/b", false, false, nil, true, false, true, 5, 4}, - {"**/c", "abcd", false, false, nil, true, false, true, 5, 4}, - {"**/c", "a/abc", false, false, nil, true, false, true, 5, 4}, + {"**/c", "c", true, true, nil, !onWindows, false, true, 5, 4}, + {"**/c", "b/c", true, true, nil, !onWindows, false, true, 5, 4}, + {"**/c", "a/b/c", true, true, nil, !onWindows, false, true, 5, 4}, + {"**/c", "a/b", false, false, nil, !onWindows, false, true, 5, 4}, + {"**/c", "abcd", false, false, nil, !onWindows, false, true, 5, 4}, + {"**/c", "a/abc", false, false, nil, !onWindows, false, true, 5, 4}, {"a/**/b", "a/b", true, true, nil, false, false, true, 2, 2}, {"a/**/c", "a/b/c", true, true, nil, false, false, true, 2, 2}, {"a/**/d", "a/b/c/d", true, true, nil, false, false, true, 1, 1}, @@ -133,11 +133,11 @@ var matchTests = []MatchTest{ {"{a/abc}", "a/abc", true, true, nil, false, false, true, 1, 1}, {"{a/b,a/c}", "a/c", true, true, nil, false, false, true, 2, 2}, {"abc/**", "abc/b", true, true, nil, false, false, true, 3, 3}, - {"**/abc", "abc", true, true, nil, true, false, true, 2, 2}, + {"**/abc", "abc", true, true, nil, !onWindows, false, true, 2, 2}, {"abc**", "abc/b", false, false, nil, false, false, true, 3, 3}, - {"**/*.txt", "abc/【test】.txt", true, true, nil, true, false, true, 1, 1}, - {"**/【*", "abc/【test】.txt", true, true, nil, true, false, true, 1, 1}, - {"**/{a,b}", "a/b", true, true, nil, true, false, true, 5, 5}, + {"**/*.txt", "abc/【test】.txt", true, true, nil, !onWindows, false, true, 1, 1}, + {"**/【*", "abc/【test】.txt", true, true, nil, !onWindows, false, true, 1, 1}, + {"**/{a,b}", "a/b", true, true, nil, !onWindows, false, true, 5, 5}, // unfortunately, io/fs can't handle this, so neither can Glob =( {"broken-symlink", "broken-symlink", true, true, nil, false, true, false, 1, 1}, {"broken-symlink/*", "a", false, false, nil, false, true, true, 0, 0},