DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use LOCAL_TEST_DATA to install test data"

Browse Source
This commit is contained in:
Dan Willemsen 2016-12-15 18:39:53 +00:00 committed by Android (Google) Code Review
commit 3eaaa8b366
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unittest/Android.mk
View File

@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
font_src_files := \
LOCAL_TEST_DATA := \
data/BoldItalic.ttf \
data/Bold.ttf \
data/ColorEmojiFont.ttf \
@ -37,24 +37,13 @@ font_src_files := \
data/itemize.xml \
data/emoji.xml
LOCAL_TEST_DATA := $(foreach f,$(LOCAL_TEST_DATA),frameworks/minikin/tests:$(f))
LOCAL_MODULE := minikin_tests
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_CLASS := NATIVE_TESTS
data_root_for_test_zip := $(local-intermediates-dir)/DATA
minikin_tests_subpath_from_data := nativetest/minikin_tests
minikin_tests_root_in_device := /data/$(minikin_tests_subpath_from_data)
minikin_tests_root_for_test_zip := $(data_root_for_test_zip)/$(minikin_tests_subpath_from_data)
GEN := $(addprefix $(minikin_tests_root_for_test_zip)/, $(font_src_files))
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)/../
$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
$(GEN): $(minikin_tests_root_for_test_zip)/data/% : $(LOCAL_PATH)/../data/%
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
LOCAL_STATIC_LIBRARIES := libminikin
LOCAL_PICKUP_FILES := $(data_root_for_test_zip)
# Shared libraries which are dependencies of minikin; these are not automatically
# pulled in by the build system (and thus sadly must be repeated).
@ -95,7 +84,9 @@ LOCAL_C_INCLUDES := \
external/libxml2/include \
external/skia/src/core
LOCAL_CPPFLAGS += -Werror -Wall -Wextra \
-DkTestFontDir="\"$(minikin_tests_root_in_device)/data/\""
LOCAL_CPPFLAGS += -Werror -Wall -Wextra
LOCAL_CPPFLAGS_32 += -DkTestFontDir="\"/data/nativetest/minikin_tests/data/\""
LOCAL_CPPFLAGS_64 += -DkTestFontDir="\"/data/nativetest64/minikin_tests/data/\""
include $(BUILD_NATIVE_TEST)

4
tests/unittest/how_to_run.txt
View File

@ -1,5 +1,3 @@
mmm -j8 frameworks/minikin/tests/unittest &&
adb push $OUT/data/nativetest/minikin_tests/minikin_tests \
/data/nativetest/minikin_tests/minikin_tests &&
adb push frameworks/minikin/tests/data /data/nativetest/minikin_tests/ &&
adb push $OUT/data/nativetest/minikin_tests /data/nativetest/ &&
adb shell /data/nativetest/minikin_tests/minikin_tests