From: Alex Brainman Date: Thu, 5 Oct 2017 06:45:10 +0000 (+1100) Subject: misc/cgo/testcshared: use correct install directory on windows X-Git-Tag: go1.10beta1~825 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e8a27daaef3ed931d4e8a78a7c784c7656dfbbf1;p=gostls13.git misc/cgo/testcshared: use correct install directory on windows Updates #11058 Change-Id: I2a8bf4403b680ab8bf06fff18291f3bf67261e27 Reviewed-on: https://go-review.googlesource.com/69090 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor --- diff --git a/misc/cgo/testcshared/cshared_test.go b/misc/cgo/testcshared/cshared_test.go index 142ccf083d..b81ec3b4c1 100644 --- a/misc/cgo/testcshared/cshared_test.go +++ b/misc/cgo/testcshared/cshared_test.go @@ -42,15 +42,15 @@ func TestMain(m *testing.M) { // Directory where cgo headers and outputs will be installed. // The installation directory format varies depending on the platform. - installdir = path.Join("pkg", fmt.Sprintf("%s_%s_testcshared_shared", GOOS, GOARCH)) + installdir = path.Join("pkg", fmt.Sprintf("%s_%s_testcshared", GOOS, GOARCH)) switch GOOS { case "darwin": libSuffix = "dylib" - installdir = path.Join("pkg", fmt.Sprintf("%s_%s_testcshared", GOOS, GOARCH)) case "windows": libSuffix = "dll" default: libSuffix = "so" + installdir = path.Join("pkg", fmt.Sprintf("%s_%s_testcshared_shared", GOOS, GOARCH)) } androiddir = fmt.Sprintf("/data/local/tmp/testcshared-%d", os.Getpid())