summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmiao <miao.zhao@mapbox.com>2019-10-21 22:42:41 +0300
committerzmiao <miao.zhao@mapbox.com>2019-10-22 15:26:58 +0300
commit79ae84a054e3161fb601e7327f37c0d883b49785 (patch)
tree3c5a62d8c672d5ea7834c8f8e00541956bb2948d
parentee436864b9659256af47caca868338790f8e9b55 (diff)
downloadqtlocation-mapboxgl-upstream/zmiao-android-test-runner.tar.gz
[test-runner] Add running instructionupstream/zmiao-android-test-runner
-rw-r--r--platform/android/src/test/render_test_runner.cpp1
-rw-r--r--render-test/android/README.md9
-rwxr-xr-xrender-test/android/render_test_setup.sh17
3 files changed, 23 insertions, 4 deletions
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp
index 85b5be6135..3f85140128 100644
--- a/platform/android/src/test/render_test_runner.cpp
+++ b/platform/android/src/test/render_test_runner.cpp
@@ -42,7 +42,6 @@ void Log::platformRecord(EventSeverity severity, const std::string& msg) {
} // namespace mbgl
void android_main(struct android_app* app) {
- using FindClassFN = jclass (*)(JNIEnv*, const char*);
mbgl::android::theJVM = app->activity->vm;
JNIEnv* env;
app->activity->vm->AttachCurrentThread(&env, NULL);
diff --git a/render-test/android/README.md b/render-test/android/README.md
new file mode 100644
index 0000000000..270c970fce
--- /dev/null
+++ b/render-test/android/README.md
@@ -0,0 +1,9 @@
+# RenderTestRunner
+
+This app is a purely native application, with no Java source code, that can run **mbgl-render-test-runner** on android devices.
+
+
+## Setup the test environment
+- Run render_test_setup.sh so that all the necessary test resources are pushed to the device.
+
+- Switch on storage permission of the app so that it can read/write data on SD card. \ No newline at end of file
diff --git a/render-test/android/render_test_setup.sh b/render-test/android/render_test_setup.sh
index edcff3ca30..e34d71df3b 100755
--- a/render-test/android/render_test_setup.sh
+++ b/render-test/android/render_test_setup.sh
@@ -4,7 +4,9 @@ adb shell rm -rf /sdcard/render-test
adb shell mkdir /sdcard/render-test
adb shell mkdir /sdcard/render-test/vendor
adb shell mkdir /sdcard/render-test/expected
+adb shell mkdir /sdcard/render-test/ignores
+# push test sources
adb push ../../mapbox-gl-js/test/integration/render-tests /sdcard/render-test/mapbox-gl-js/test/integration/render-tests
adb push ../../mapbox-gl-js/test/integration/query-tests /sdcard/render-test/mapbox-gl-js/test/integration/query-tests
adb push ../../mapbox-gl-js/test/integration/tiles /sdcard/render-test/mapbox-gl-js/test/integration/tiles
@@ -16,12 +18,21 @@ adb push ../../mapbox-gl-js/test/integration/video /sdcard/render-test/mapbox-gl
adb push ../../vendor/mapbox-gl-styles/styles /sdcard/render-test/vendor/mapbox-gl-styles/styles
adb push ../../vendor/mapbox-gl-styles/sprites /sdcard/render-test/vendor/mapbox-gl-styles/sprites
adb push ../../mapbox-gl-js/test/integration/data /sdcard/render-test/mapbox-gl-js/test/integration/data
-adb push ../../mapbox-gl-js/test/integration/geojson /sdcard/render-test/mapbox-gl-js/test/integration/geojson
-adb push ../../render-test/expected /sdcard/render-test/render-test/expected
-
+adb push ../../mapbox-gl-js/test/integration/geojson /sdcard/render-test/mapbox-gl-js/test/integration/geojson
mkdir sprites
cp -r ../../mapbox-gl-js/test/integration/sprites/ sprites
adb push sprites /sdcard/render-test/mapbox-gl-js/test/integration/sprites
rm -rf sprites
+# push extra expectations
+adb push ../../render-test/expected /sdcard/render-test/render-test/expected
+
+# push default ignore lists
+adb shell mkdir /sdcard/render-test/platform
+adb shell mkdir /sdcard/render-test/platform/node
+adb shell mkdir /sdcard/render-test/platform/node/test
+adb push ../../platform/node/test/ignores.json /sdcard/render-test/platform/node/test
+adb shell mkdir /sdcard/render-test/render-test
+adb push ../../render-test/linux-ignores.json /sdcard/render-test/render-test
+
adb shell ls /sdcard/render-test/ \ No newline at end of file