status-im
/
mobile
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bind/java: fix tests on Windows 

Make the golang.org/x/mobile/bind/java buildable without CGO, and
replace the which tool with exec.LookPath. Both helps on Windows that
often don't have a C compiler available and no which command.

Found while testing external NDK use on Windows.

Change-Id: I6d3311aae3fa97acb61b5ab9bed334e4a608c386
Reviewed-on: https://go-review.googlesource.com/35174
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Elias Naur 2017-01-13 01:00:19 +01:00
parent 2802a0168e
commit 91f2c8983e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bind/java/doc.go
View File

@ -6,5 +6,3 @@
//
// See the design document (http://golang.org/s/gobind).
package java
import "C"

15
bind/java/seq_test.go
View File

@ -64,20 +64,25 @@ func TestJavaSeqBench(t *testing.T) {
// This requires the gradle command in PATH and
// the Android SDK whose path is available through ANDROID_HOME environment variable.
func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
if _, err := run("which gradle"); err != nil {
gradle, err := exec.LookPath("gradle")
if err != nil {
t.Skip("command gradle not found, skipping")
}
if sdk := os.Getenv("ANDROID_HOME"); sdk == "" {
t.Skip("ANDROID_HOME environment var not set, skipping")
}
if _, err := run("which gomobile"); err != nil {
gomobile, err := exec.LookPath("gomobile")
if err != nil {
t.Log("go install gomobile")
if _, err := run("go install golang.org/x/mobile/cmd/gomobile"); err != nil {
t.Fatalf("gomobile install failed: %v", err)
}
if gomobile, err = exec.LookPath("gomobile"); err != nil {
t.Fatalf("gomobile install failed: %v", err)
}
t.Log("gomobile init")
start := time.Now()
if _, err := run("gomobile init"); err != nil {
if _, err := run(gomobile + " init"); err != nil {
t.Fatalf("gomobile init failed: %v", err)
}
t.Logf("gomobile init took %v", time.Since(start))
@ -111,7 +116,7 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
args = append(args, "-javapkg", javaPkg)
}
args = append(args, pkgNames...)
buf, err := exec.Command("gomobile", args...).CombinedOutput()
buf, err := exec.Command(gomobile, args...).CombinedOutput()
if err != nil {
t.Logf("%s", buf)
t.Fatalf("failed to run gomobile bind: %v", err)
@ -141,7 +146,7 @@ func runTest(t *testing.T, pkgNames []string, javaPkg, javaCls string) {
t.Fatalf("failed to write build.gradle file: %v", err)
}
if buf, err := run("gradle connectedAndroidTest"); err != nil {
if buf, err := run(gradle + " connectedAndroidTest"); err != nil {
t.Logf("%s", buf)
t.Errorf("failed to run gradle test: %v", err)
}