diff options
Diffstat (limited to 'src/pkg/path')
-rw-r--r-- | src/pkg/path/filepath/match.go | 2 | ||||
-rw-r--r-- | src/pkg/path/filepath/path.go | 2 | ||||
-rw-r--r-- | src/pkg/path/filepath/path_test.go | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/pkg/path/filepath/match.go b/src/pkg/path/filepath/match.go index 9c344309d..7fcc214c0 100644 --- a/src/pkg/path/filepath/match.go +++ b/src/pkg/path/filepath/match.go @@ -272,7 +272,7 @@ func glob(dir, pattern string, matches []string) (m []string, e os.Error) { if err != nil { return } - sort.SortStrings(names) + sort.Strings(names) for _, n := range names { matched, err := Match(pattern, n) diff --git a/src/pkg/path/filepath/path.go b/src/pkg/path/filepath/path.go index dcd8017ad..b181483ed 100644 --- a/src/pkg/path/filepath/path.go +++ b/src/pkg/path/filepath/path.go @@ -136,7 +136,7 @@ func SplitList(path string) []string { if path == "" { return []string{} } - return strings.Split(path, string(ListSeparator), -1) + return strings.Split(path, string(ListSeparator)) } // Split splits path immediately following the final Separator, diff --git a/src/pkg/path/filepath/path_test.go b/src/pkg/path/filepath/path_test.go index 6a5dd5b00..58c4c0301 100644 --- a/src/pkg/path/filepath/path_test.go +++ b/src/pkg/path/filepath/path_test.go @@ -293,10 +293,6 @@ func (v *TestVisitor) VisitFile(path string, f *os.FileInfo) { } func TestWalk(t *testing.T) { - // TODO(brainman): enable test once Windows version is implemented. - if runtime.GOOS == "windows" { - return - } makeTree(t) // 1) ignore error handling, expect none |