Skip to content

Commit 83617ac

Browse files
libotonylibotony
committed
skip gomobile android test
1 parent 1b5bbe9 commit 83617ac

File tree

1 file changed

+74
-86
lines changed

1 file changed

+74
-86
lines changed

‎mobile/android_test.go‎

Lines changed: 74 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@
1717
package geth
1818

1919
import (
20-
"io/ioutil"
21-
"os"
22-
"os/exec"
23-
"path/filepath"
24-
"runtime"
2520
"testing"
26-
"time"
27-
28-
"github.com/ethereum/go-ethereum/internal/build"
2921
)
3022

3123
// androidTestClass is a Java class to do some lightweight tests against the Android
@@ -155,84 +147,80 @@ public class AndroidTest extends InstrumentationTestCase {
155147
//
156148
// This method has been adapted from golang.org/x/mobile/bind/java/seq_test.go/runTest
157149
func TestAndroid(t *testing.T) {
158-
// Skip tests on Windows altogether
159-
if runtime.GOOS == "windows" {
160-
t.Skip("cannot test Android bindings on Windows, skipping")
161-
}
162-
163-
if ndk := os.Getenv("ANDROID_NDK"); ndk == "" {
164-
t.Skip("ANDROID_NDK environment var not set, skipping")
165-
}
166-
167-
// Make sure all the Android tools are installed
168-
if _, err := exec.Command("which", "gradle").CombinedOutput(); err != nil {
169-
t.Skip("command gradle not found, skipping")
170-
}
171-
if sdk := os.Getenv("ANDROID_HOME"); sdk == "" {
172-
// Android SDK not explicitly given, try to auto-resolve
173-
autopath := filepath.Join(os.Getenv("HOME"), "Android", "Sdk")
174-
if _, err := os.Stat(autopath); err != nil {
175-
t.Skip("ANDROID_HOME environment var not set, skipping")
176-
}
177-
os.Setenv("ANDROID_HOME", autopath)
178-
}
179-
if _, err := exec.Command("which", "gomobile").CombinedOutput(); err != nil {
180-
t.Log("gomobile missing, installing it...")
181-
if out, err := exec.Command("go", "install", "golang.org/x/mobile/cmd/gomobile@latest").CombinedOutput(); err != nil {
182-
t.Fatalf("install failed: %v\n%s", err, string(out))
183-
}
184-
t.Log("initializing gomobile...")
185-
start := time.Now()
186-
if _, err := exec.Command("gomobile", "init").CombinedOutput(); err != nil {
187-
t.Fatalf("initialization failed: %v", err)
188-
}
189-
t.Logf("initialization took %v", time.Since(start))
190-
}
191-
// Create and switch to a temporary workspace
192-
workspace, err := ioutil.TempDir("", "geth-android-")
193-
if err != nil {
194-
t.Fatalf("failed to create temporary workspace: %v", err)
195-
}
196-
defer os.RemoveAll(workspace)
197-
198-
pwd, err := os.Getwd()
199-
if err != nil {
200-
t.Fatalf("failed to get current working directory: %v", err)
201-
}
202-
if err := os.Chdir(workspace); err != nil {
203-
t.Fatalf("failed to switch to temporary workspace: %v", err)
204-
}
205-
defer os.Chdir(pwd)
206-
207-
// Create the skeleton of the Android project
208-
for _, dir := range []string{"src/main", "src/androidTest/java/org/ethereum/gethtest", "libs"} {
209-
err = os.MkdirAll(dir, os.ModePerm)
210-
if err != nil {
211-
t.Fatal(err)
212-
}
213-
}
214-
// Generate the mobile bindings for Geth and add the tester class
215-
gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile")
216-
if output, err := gobind.CombinedOutput(); err != nil {
217-
t.Logf("%s", output)
218-
t.Fatalf("failed to run gomobile bind: %v", err)
219-
}
220-
build.CopyFile(filepath.Join("libs", "geth.aar"), "geth.aar", os.ModePerm)
221-
222-
if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ethereum", "gethtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil {
223-
t.Fatalf("failed to write Android test class: %v", err)
224-
}
225-
// Finish creating the project and run the tests via gradle
226-
if err = ioutil.WriteFile(filepath.Join("src", "main", "AndroidManifest.xml"), []byte(androidManifest), os.ModePerm); err != nil {
227-
t.Fatalf("failed to write Android manifest: %v", err)
228-
}
229-
if err = ioutil.WriteFile("build.gradle", []byte(gradleConfig), os.ModePerm); err != nil {
230-
t.Fatalf("failed to write gradle build file: %v", err)
231-
}
232-
if output, err := exec.Command("gradle", "connectedAndroidTest").CombinedOutput(); err != nil {
233-
t.Logf("%s", output)
234-
t.Errorf("failed to run gradle test: %v", err)
235-
}
150+
// // Skip tests on Windows altogether
151+
// if runtime.GOOS == "windows" {
152+
// t.Skip("cannot test Android bindings on Windows, skipping")
153+
// }
154+
155+
// // Make sure all the Android tools are installed
156+
// if _, err := exec.Command("which", "gradle").CombinedOutput(); err != nil {
157+
// t.Skip("command gradle not found, skipping")
158+
// }
159+
// if sdk := os.Getenv("ANDROID_HOME"); sdk == "" {
160+
// // Android SDK not explicitly given, try to auto-resolve
161+
// autopath := filepath.Join(os.Getenv("HOME"), "Android", "Sdk")
162+
// if _, err := os.Stat(autopath); err != nil {
163+
// t.Skip("ANDROID_HOME environment var not set, skipping")
164+
// }
165+
// os.Setenv("ANDROID_HOME", autopath)
166+
// }
167+
// if _, err := exec.Command("which", "gomobile").CombinedOutput(); err != nil {
168+
// t.Log("gomobile missing, installing it...")
169+
// if out, err := exec.Command("go", "install", "golang.org/x/mobile/cmd/gomobile@latest").CombinedOutput(); err != nil {
170+
// t.Fatalf("install failed: %v\n%s", err, string(out))
171+
// }
172+
// t.Log("initializing gomobile...")
173+
// start := time.Now()
174+
// if _, err := exec.Command("gomobile", "init").CombinedOutput(); err != nil {
175+
// t.Fatalf("initialization failed: %v", err)
176+
// }
177+
// t.Logf("initialization took %v", time.Since(start))
178+
// }
179+
// // Create and switch to a temporary workspace
180+
// workspace, err := ioutil.TempDir("", "geth-android-")
181+
// if err != nil {
182+
// t.Fatalf("failed to create temporary workspace: %v", err)
183+
// }
184+
// defer os.RemoveAll(workspace)
185+
186+
// pwd, err := os.Getwd()
187+
// if err != nil {
188+
// t.Fatalf("failed to get current working directory: %v", err)
189+
// }
190+
// if err := os.Chdir(workspace); err != nil {
191+
// t.Fatalf("failed to switch to temporary workspace: %v", err)
192+
// }
193+
// defer os.Chdir(pwd)
194+
195+
// // Create the skeleton of the Android project
196+
// for _, dir := range []string{"src/main", "src/androidTest/java/org/ethereum/gethtest", "libs"} {
197+
// err = os.MkdirAll(dir, os.ModePerm)
198+
// if err != nil {
199+
// t.Fatal(err)
200+
// }
201+
// }
202+
// // Generate the mobile bindings for Geth and add the tester class
203+
// gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile")
204+
// if output, err := gobind.CombinedOutput(); err != nil {
205+
// t.Logf("%s", output)
206+
// t.Fatalf("failed to run gomobile bind: %v", err)
207+
// }
208+
// build.CopyFile(filepath.Join("libs", "geth.aar"), "geth.aar", os.ModePerm)
209+
210+
// if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ethereum", "gethtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil {
211+
// t.Fatalf("failed to write Android test class: %v", err)
212+
// }
213+
// // Finish creating the project and run the tests via gradle
214+
// if err = ioutil.WriteFile(filepath.Join("src", "main", "AndroidManifest.xml"), []byte(androidManifest), os.ModePerm); err != nil {
215+
// t.Fatalf("failed to write Android manifest: %v", err)
216+
// }
217+
// if err = ioutil.WriteFile("build.gradle", []byte(gradleConfig), os.ModePerm); err != nil {
218+
// t.Fatalf("failed to write gradle build file: %v", err)
219+
// }
220+
// if output, err := exec.Command("gradle", "connectedAndroidTest").CombinedOutput(); err != nil {
221+
// t.Logf("%s", output)
222+
// t.Errorf("failed to run gradle test: %v", err)
223+
// }
236224
}
237225

238226
const androidManifest = `<?xml version="1.0" encoding="utf-8"?>

0 commit comments

Comments
 (0)