diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-01-08 12:12:32 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-01-10 18:20:02 +0200 |
| commit | 2e00a8762dae3443b99a1e0c490e36a23f16aed1 (patch) | |
| tree | 6ea84dba07cbf40136a1f48d8fd481ef3efde641 /Makefile | |
| parent | 6146fc5ba73d989a1121b76480effd62908df2ef (diff) | |
| download | qtlocation-mapboxgl-upstream/alexshalamov_fix_core_android_unittests.tar.gz | |
[android] Add list of skipped core unit testsupstream/alexshalamov_fix_core_android_unittests
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -555,8 +555,11 @@ run-android-core-test-$1-%: android-core-test-$1 adb push mapbox-gl-js/src/style-spec/reference/v8.json $(MBGL_ANDROID_LOCAL_WORK_DIR)/mapbox-gl-js/src/style-spec/reference > /dev/null 2>&1 adb push platform/android/MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 +# Create gtest filter for skipped tests. + $(eval SKIPPED_TESTS := -$(shell sed -n '/#\|^$$/!p' platform/android/tests/skipped.txt | sed ':a;$!N;s/\n/:/g;ta')) + # Kick off the tests - adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && chmod +x mbgl-test && ./mbgl-test --class_path=$(MBGL_ANDROID_LOCAL_WORK_DIR)/classes.dex --gtest_filter=$$*" + adb shell "export LD_LIBRARY_PATH=$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && chmod +x mbgl-test && ./mbgl-test --class_path=$(MBGL_ANDROID_LOCAL_WORK_DIR)/classes.dex --gtest_filter=$$*:$(SKIPPED_TESTS)" # Gather the results and unpack them adb shell "cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && tar -cvzf results.tgz test/fixtures/* > /dev/null 2>&1" |