tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests: Create res-testdata for testdata pickup.

Browse source 
It doesn't change the functionality of the test, but allows easier
conversion to Soong.

Test: Run recovery_component_test on marlin.
Change-Id: Ic7419dc86c6b220531ae44e49ab4657394a5d7fa
This commit is contained in:
Tao Bao 2018-07-24 14:58:05 -07:00
parent afa16480aa
commit 13f9816e14
7 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Android.mk
View file

@ -208,7 +208,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_TEST_DATA := \
$(call find-test-data-in-subdirs, $(LOCAL_PATH), "*", testdata) \
$(call find-test-data-in-subdirs, bootable/recovery, "*_text.png", res-*)
$(call find-test-data-in-subdirs, $(LOCAL_PATH), "*_text.png", res-testdata)
include $(BUILD_NATIVE_TEST)
# Host tests

9
tests/component/resources_test.cpp
View file

@ -32,10 +32,11 @@
static const std::string kLocale = "zu";
static const std::vector<std::string> kResourceImagesDirs{ "res-mdpi/images/", "res-hdpi/images/",
"res-xhdpi/images/",
"res-xxhdpi/images/",
"res-xxxhdpi/images/" };
static const std::vector<std::string> kResourceImagesDirs{
"res-testdata/res-mdpi/images/", "res-testdata/res-hdpi/images/",
"res-testdata/res-xhdpi/images/", "res-testdata/res-xxhdpi/images/",
"res-testdata/res-xxxhdpi/images/",
};
static int png_filter(const dirent* de) {
if (de->d_type != DT_REG || !android::base::EndsWith(de->d_name, "_text.png")) {

1
tests/res-testdata/res-hdpi Symbolic link
View file

@ -0,0 +1 @@
../../res-hdpi

1
tests/res-testdata/res-mdpi Symbolic link
View file

@ -0,0 +1 @@
../../res-mdpi

1
tests/res-testdata/res-xhdpi Symbolic link
View file

@ -0,0 +1 @@
../../res-xhdpi

1
tests/res-testdata/res-xxhdpi Symbolic link
View file

@ -0,0 +1 @@
../../res-xxhdpi

1
tests/res-testdata/res-xxxhdpi Symbolic link
View file

@ -0,0 +1 @@
../../res-xxxhdpi