]> Cypherpunks repositories - gostls13.git/commitdiff
misc/cgo/testcshared: use correct install directory on windows
authorAlex Brainman <alex.brainman@gmail.com>
Thu, 5 Oct 2017 06:45:10 +0000 (17:45 +1100)
committerAlex Brainman <alex.brainman@gmail.com>
Sun, 8 Oct 2017 23:37:17 +0000 (23:37 +0000)
Updates #11058

Change-Id: I2a8bf4403b680ab8bf06fff18291f3bf67261e27
Reviewed-on: https://go-review.googlesource.com/69090
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>

misc/cgo/testcshared/cshared_test.go

index 142ccf083d392246e5b30f3f49b44031eaa88e89..b81ec3b4c12d57afca484bc13ee6cb93f44eebae 100644 (file)
@@ -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())