Commit 54f6911a authored by Alex Brainman's avatar Alex Brainman

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

Hopefully fixes build.

Change-Id: If0629b95b923a65e4507073cf7aa44a5e178fc0f
Reviewed-on: https://go-review.googlesource.com/56711Reviewed-by: default avatarIan Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
parent ef94870c
...@@ -139,7 +139,7 @@ func adbPush(t *testing.T, filename string) { ...@@ -139,7 +139,7 @@ func adbPush(t *testing.T, filename string) {
if GOOS != "android" { if GOOS != "android" {
return 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:]...) cmd := exec.Command(args[0], args[1:]...)
if out, err := cmd.CombinedOutput(); err != nil { if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("adb command failed: %v\n%s\n", err, out) t.Fatalf("adb command failed: %v\n%s\n", err, out)
...@@ -150,7 +150,7 @@ func adbRun(t *testing.T, adbargs ...string) string { ...@@ -150,7 +150,7 @@ func adbRun(t *testing.T, adbargs ...string) string {
if GOOS != "android" { if GOOS != "android" {
t.Fatalf("trying to run adb command when operating system is not 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...) args = append(args, adbargs...)
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment