Commit 2184137c authored by Rob Pike's avatar Rob Pike

path/filepath/path_test.go: repair and enable TestAbs

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5759051
parent 73b8ccb0
...@@ -642,33 +642,61 @@ func TestEvalSymlinks(t *testing.T) { ...@@ -642,33 +642,61 @@ func TestEvalSymlinks(t *testing.T) {
} }
} }
// Test paths relative to $GOROOT/src // Test directories relative to temporary directory.
var abstests = []string{ // The tests are run in absTestDirs[0].
"../AUTHORS", var absTestDirs = []string{
"pkg/../../AUTHORS", "a",
"Make.inc", "a/b",
"pkg/math", "a/b/c",
}
// Test paths relative to temporary directory. $ expands to the directory.
// The tests are run in absTestDirs[0].
// We create absTestDirs first.
var absTests = []string{
".", ".",
"$GOROOT/src/Make.inc", "b",
"$GOROOT/src/../src/Make.inc", "../a",
"$GOROOT/misc/cgo", "../a/b",
"$GOROOT", "../a/b/./c/../../.././a",
"$",
"$/.",
"$/a/../a/b",
"$/a/b/c/../../.././a",
} }
func TestAbs(t *testing.T) { func TestAbs(t *testing.T) {
t.Logf("test needs to be rewritten; disabled")
return
oldwd, err := os.Getwd() oldwd, err := os.Getwd()
if err != nil { if err != nil {
t.Fatal("Getwd failed: " + err.Error()) t.Fatal("Getwd failed: ", err)
} }
defer os.Chdir(oldwd) defer os.Chdir(oldwd)
goroot := os.Getenv("GOROOT")
cwd := filepath.Join(goroot, "src") root, err := ioutil.TempDir("", "TestAbs")
os.Chdir(cwd) if err != nil {
for _, path := range abstests { t.Fatal("TempDir failed: ", err)
path = strings.Replace(path, "$GOROOT", goroot, -1) }
defer os.RemoveAll(root)
err = os.Chdir(root)
if err != nil {
t.Fatal("chdir failed: ", err)
}
for _, dir := range absTestDirs {
err = os.Mkdir(dir, 0777)
if err != nil {
t.Fatal("Mkdir failed: ", err)
}
}
err = os.Chdir(absTestDirs[0])
if err != nil {
t.Fatal("chdir failed: ", err)
}
for _, path := range absTests {
path = strings.Replace(path, "$", root, -1)
info, err := os.Stat(path) info, err := os.Stat(path)
if err != nil { if err != nil {
t.Errorf("%s: %s", path, err) t.Errorf("%s: %s", path, err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment