misc/cgo/testcshared: support testing on self-hosted android

Only invoke adb for android if we're not running on android already.

Change-Id: I4eb94286a5bf09b382716a0474f3aebec40f5d74
Reviewed-on: https://go-review.googlesource.com/c/go/+/170953
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/misc/cgo/testcshared/cshared_test.go b/misc/cgo/testcshared/cshared_test.go
index 8dac639042e90b8329eea91599834601d87ed2a1..97f786e6c531e6af9e32989c31feaff705306e3e 100644 (file)
--- a/misc/cgo/testcshared/cshared_test.go
+++ b/misc/cgo/testcshared/cshared_test.go
@@ -13,6 +13,7 @@ import (
        "os"
        "os/exec"
        "path/filepath"
+       "runtime"
        "strings"
        "sync"
        "testing"
@@ -45,7 +46,7 @@ func testMain(m *testing.M) int {
        }
 
        androiddir = fmt.Sprintf("/data/local/tmp/testcshared-%d", os.Getpid())
-       if GOOS == "android" {
+       if runtime.GOOS != GOOS && GOOS == "android" {
                args := append(adbCmd(), "exec-out", "mkdir", "-p", androiddir)
                cmd := exec.Command(args[0], args[1:]...)
                out, err := cmd.CombinedOutput()
@@ -177,7 +178,7 @@ func adbCmd() []string {
 }
 
 func adbPush(t *testing.T, filename string) {
-       if GOOS != "android" {
+       if runtime.GOOS == GOOS || GOOS != "android" {
                return
        }
        args := append(adbCmd(), "push", filename, fmt.Sprintf("%s/%s", androiddir, filename))
@@ -236,7 +237,7 @@ func run(t *testing.T, extraEnv []string, args ...string) string {
 
 func runExe(t *testing.T, extraEnv []string, args ...string) string {
        t.Helper()
-       if GOOS == "android" {
+       if runtime.GOOS != GOOS && GOOS == "android" {
                return adbRun(t, append(os.Environ(), extraEnv...), args...)
        }
        return run(t, extraEnv, args...)
@@ -268,7 +269,7 @@ func createHeaders() error {
                return fmt.Errorf("command failed: %v\n%v\n%s\n", args, err, out)
        }
 
-       if GOOS == "android" {
+       if runtime.GOOS != GOOS && GOOS == "android" {
                args = append(adbCmd(), "push", libgoname, fmt.Sprintf("%s/%s", androiddir, libgoname))
                cmd = exec.Command(args[0], args[1:]...)
                out, err = cmd.CombinedOutput()