From 7be432e65979f88aceba000db37c325c81127c7d Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 25 Feb 2019 11:18:03 +0100 Subject: [PATCH] misc/android: copy testdata directories to device before running We've got away with not copying the testdata directories for the standard library because the exec wrapper also pushes almost the entire $GOROOT tree to the device, including testdata directories. Similar to what the iOS exec wrapper does. Change-Id: I91ef63ef84a658fc8843002890132c64b7c1d20e Reviewed-on: https://go-review.googlesource.com/c/163626 Run-TryBot: Elias Naur TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- misc/android/go_android_exec.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/misc/android/go_android_exec.go b/misc/android/go_android_exec.go index 0055fb832a..fa84f00f67 100644 --- a/misc/android/go_android_exec.go +++ b/misc/android/go_android_exec.go @@ -95,6 +95,7 @@ func main() { } else { adbSyncGoroot() } + run("shell", "mkdir", "-p", deviceCwd) // Binary names can conflict. // E.g. template.test from the {html,text}/template packages. @@ -102,6 +103,10 @@ func main() { deviceBin := fmt.Sprintf("%s/%s", deviceGotmp, binName) run("push", os.Args[1], deviceBin) + if _, err := os.Stat("testdata"); err == nil { + run("push", "testdata", deviceCwd) + } + // Forward SIGQUIT from the go command to show backtraces from // the binary instead of from this wrapper. quit := make(chan os.Signal, 1) -- 2.50.0