Skip to content

Commit

Permalink
fix bug in windows (#5844)
Browse files Browse the repository at this point in the history
* fix bug in windows

* fix file name bug

* test in unix like platform
  • Loading branch information
kvii committed Nov 21, 2022
1 parent cef3de6 commit b6836c2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion utils/utils.go
Expand Up @@ -27,7 +27,7 @@ func sourceDir(file string) string {
if filepath.Base(s) != "gorm.io" {
s = dir
}
return s + string(filepath.Separator)
return filepath.ToSlash(s) + "/"
}

// FileWithLineNum return the file name and line number of the current file
Expand Down
7 changes: 6 additions & 1 deletion utils/utils_unix_test.go
@@ -1,6 +1,11 @@
//go:build unix
// +build unix

package utils

import "testing"
import (
"testing"
)

func TestSourceDir(t *testing.T) {
cases := []struct {
Expand Down
20 changes: 11 additions & 9 deletions utils/utils_windows_test.go
@@ -1,27 +1,29 @@
package utils

import "testing"
import (
"testing"
)

func TestSourceDir(t *testing.T) {
cases := []struct {
file string
want string
}{
{
file: `C:\Users\name\go\pkg\mod\gorm.io\gorm@v1.20.8\utils\utils.go`,
want: `C:\Users\name\go\pkg\mod\gorm.io`,
file: `C:/Users/name/go/pkg/mod/gorm.io/gorm@v1.2.3/utils/utils.go`,
want: `C:/Users/name/go/pkg/mod/gorm.io/`,
},
{
file: `C:\go\work\proj\gorm\utils\utils.go`,
want: `C:\go\work\proj\gorm`,
file: `C:/go/work/proj/gorm/utils/utils.go`,
want: `C:/go/work/proj/gorm/`,
},
{
file: `C:\go\work\proj\gorm_alias\utils\utils.go`,
want: `C:\go\work\proj\gorm_alias`,
file: `C:/go/work/proj/gorm_alias/utils/utils.go`,
want: `C:/go/work/proj/gorm_alias/`,
},
{
file: `C:\go\work\proj\my.gorm.io\gorm\utils\utils.go`,
want: `C:\go\work\proj\my.gorm.io\gorm`,
file: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/utils/utils.go`,
want: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/`,
},
}
for _, c := range cases {
Expand Down

0 comments on commit b6836c2

Please sign in to comment.