mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alex Brainman 2017-08-18 13:53:42 +10:00
parent ef94870cc8
commit 54f6911af5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/cgo/testcshared/cshared_test.go
View File

@ -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 {
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()