refactor test helpers

This commit is contained in:
Songmu 2019-12-19 02:21:20 +09:00
parent 49090e8ebd
commit 7be651ad84
3 changed files with 11 additions and 9 deletions

View file

@ -112,7 +112,11 @@ func newTempDir(t *testing.T) string {
t.Fatalf("os.Getwd(): %s", err)
}
return toFullPath(tmpdir)
s, err := toFullPath(tmpdir)
if err != nil {
t.Fatalf("toFullPath(%q): %s", tmpdir, err)
}
return s
}
func tmpEnv(key, val string) func() {

View file

@ -2,6 +2,6 @@
package main
func toFullPath(s string) string {
return s
func toFullPath(s string) (string, error) {
return s, nil
}

View file

@ -4,22 +4,20 @@ package main
import "syscall"
func toFullPath(s string) string {
func toFullPath(s string) (string, error) {
p := syscall.StringToUTF16(s)
b := p
n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil {
println("error", err.Error())
return s
return s, err
}
if n > uint32(len(b)) {
b = make([]uint16, n)
n, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil {
println("error", err.Error())
return s
return s, err
}
}
b = b[:n]
return syscall.UTF16ToString(b)
return syscall.UTF16ToString(b), nil
}