]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: use filepath.Base for getting $CC name in TestCgoContainsSpace
authorHiroshi Ioka <hirochachacha@gmail.com>
Fri, 12 May 2017 04:45:55 +0000 (13:45 +0900)
committerBrad Fitzpatrick <bradfitz@golang.org>
Fri, 12 May 2017 13:30:24 +0000 (13:30 +0000)
Change-Id: If7329b81073d7c98fdcb8a2c0b35f8708000606e
Reviewed-on: https://go-review.googlesource.com/43332
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/cmd/go/go_test.go

index 73489ca27420f0f44338fb1090f7e78b9fcc51fc..041773ba9128097d58606b59b9638ced2ceb9c57 100644 (file)
@@ -4055,7 +4055,9 @@ func TestCgoFlagContainsSpace(t *testing.T) {
        tg := testgo(t)
        defer tg.cleanup()
 
-       tg.tempFile(fmt.Sprintf("src/%s/main.go", testCC), fmt.Sprintf(`package main
+       ccName := filepath.Base(testCC)
+
+       tg.tempFile(fmt.Sprintf("src/%s/main.go", ccName), fmt.Sprintf(`package main
                import (
                        "os"
                        "os/exec"
@@ -4095,9 +4097,9 @@ func TestCgoFlagContainsSpace(t *testing.T) {
                        }
                }
        `, testCC))
-       tg.cd(tg.path(fmt.Sprintf("src/%s", testCC)))
+       tg.cd(tg.path(fmt.Sprintf("src/%s", ccName)))
        tg.run("build")
-       tg.setenv("CC", tg.path(fmt.Sprintf("src/%s/%s", testCC, testCC)))
+       tg.setenv("CC", tg.path(fmt.Sprintf("src/%s/%s", ccName, ccName)))
 
        tg.tempFile("src/cgo/main.go", `package main
                // #cgo CFLAGS: -I"c flags"