From: Hiroshi Ioka <hirochachacha@gmail.com>
Date: Fri, 12 May 2017 04:45:55 +0000 (+0900)
Subject: cmd/go: use filepath.Base for getting $CC name in TestCgoContainsSpace
X-Git-Tag: go1.9beta1~270
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=22538477a3cceb4f03b7c44cad6fe19e9e9e06b3;p=gostls13.git

cmd/go: use filepath.Base for getting $CC name in TestCgoContainsSpace

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>
---

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 73489ca274..041773ba91 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -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"