vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #20263 from Microsoft/jjh/testunit-fileutils

Browse source 
Windows CI: Fixes panic in test-unit for FileUtils
This commit is contained in:
David Calavera 2016-02-25 17:35:32 -08:00
commit 366b774b47
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fileutils/fileutils.go
View file

@ -52,7 +52,7 @@ func CleanPatterns(patterns []string) ([]string, [][]string, bool, error) {
if exclusion(pattern) { if exclusion(pattern) {
pattern = pattern[1:] pattern = pattern[1:]
} }
patternDirs = append(patternDirs, strings.Split(pattern, "/")) patternDirs = append(patternDirs, strings.Split(pattern, string(os.PathSeparator)))
} }
return cleanedPatterns, patternDirs, exceptions, nil return cleanedPatterns, patternDirs, exceptions, nil
@ -83,8 +83,9 @@ func Matches(file string, patterns []string) (bool, error) {
// The more generic fileutils.Matches() can't make these assumptions. // The more generic fileutils.Matches() can't make these assumptions.
func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, error) { func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, error) {
matched := false matched := false
file = filepath.FromSlash(file)
parentPath := filepath.Dir(file) parentPath := filepath.Dir(file)
parentPathDirs := strings.Split(parentPath, "/") parentPathDirs := strings.Split(parentPath, string(os.PathSeparator))
for i, pattern := range patterns { for i, pattern := range patterns {
negative := false negative := false
@ -102,8 +103,8 @@ func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool,
if !match && parentPath != "." { if !match && parentPath != "." {
// Check to see if the pattern matches one of our parent dirs. // Check to see if the pattern matches one of our parent dirs.
if len(patDirs[i]) <= len(parentPathDirs) { if len(patDirs[i]) <= len(parentPathDirs) {
match, _ = regexpMatch(strings.Join(patDirs[i], "/"), match, _ = regexpMatch(strings.Join(patDirs[i], string(os.PathSeparator)),
strings.Join(parentPathDirs[:len(patDirs[i])], "/")) strings.Join(parentPathDirs[:len(patDirs[i])], string(os.PathSeparator)))
} }
} }
@ -125,6 +126,9 @@ func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool,
// of directories. This means that we should be backwards compatible // of directories. This means that we should be backwards compatible
// with filepath.Match(). We'll end up supporting more stuff, due to // with filepath.Match(). We'll end up supporting more stuff, due to
// the fact that we're using regexp, but that's ok - it does no harm. // the fact that we're using regexp, but that's ok - it does no harm.
//
// As per the comment in golangs filepath.Match, on Windows, escaping
// is disabled. Instead, '\\' is treated as path separator.
func regexpMatch(pattern, path string) (bool, error) { func regexpMatch(pattern, path string) (bool, error) {
regStr := "^" regStr := "^"