From: Alex Brainman <alex.brainman@gmail.com>
Date: Fri, 18 Aug 2017 03:53:42 +0000 (+1000)
Subject: misc/cgo/testcshared: use adb instead of ./adb on android
X-Git-Tag: go1.10beta1~1483
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=54f6911af507c7062e2f4ddbd0e7d88fff7d431b;p=gostls13.git

misc/cgo/testcshared: use adb instead of ./adb on android

Hopefully fixes build.

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

diff --git a/misc/cgo/testcshared/cshared_test.go b/misc/cgo/testcshared/cshared_test.go
index c7317a43eb..b8fd4f3fbc 100644
--- a/misc/cgo/testcshared/cshared_test.go
+++ b/misc/cgo/testcshared/cshared_test.go
@@ -139,7 +139,7 @@ func adbPush(t *testing.T, filename string) {
 	if GOOS != "android" {
 		return
 	}
-	args := append(cmdToRun("adb"), "push", filename, fmt.Sprintf("%s/%s", androiddir, filename))
+	args := append("adb", "push", filename, fmt.Sprintf("%s/%s", androiddir, filename))
 	cmd := exec.Command(args[0], args[1:]...)
 	if out, err := cmd.CombinedOutput(); err != nil {
 		t.Fatalf("adb command failed: %v\n%s\n", err, out)
@@ -150,7 +150,7 @@ func adbRun(t *testing.T, adbargs ...string) string {
 	if GOOS != "android" {
 		t.Fatalf("trying to run adb command when operating system is not android.")
 	}
-	args := append(cmdToRun("adb"), "shell")
+	args := append("adb", "shell")
 	args = append(args, adbargs...)
 	cmd := exec.Command(args[0], args[1:]...)
 	out, err := cmd.CombinedOutput()