summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-08-13 17:51:05 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-08-13 17:51:05 +0200
commitda7bf54cd8228e667c8c512524f2caf8976e0602 (patch)
tree9cad96e98cd381cf6cadbbd3f78d2d7fc8e0ff6e
parentMerge "Build boot control HAL with Android.bp" am: bbe881693a am: b5e9049476 (diff)
parentMerge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 (diff)
downloadandroid_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar.gz
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar.bz2
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar.lz
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar.xz
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.tar.zst
android_bootable_recovery-da7bf54cd8228e667c8c512524f2caf8976e0602.zip
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/component/resources_test.cpp9
l---------tests/res-testdata/res-hdpi1
l---------tests/res-testdata/res-mdpi1
l---------tests/res-testdata/res-xhdpi1
l---------tests/res-testdata/res-xxhdpi1
l---------tests/res-testdata/res-xxxhdpi1
7 files changed, 11 insertions, 5 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 3d3e63e7e..ef64d76ab 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -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
diff --git a/tests/component/resources_test.cpp b/tests/component/resources_test.cpp
index 618d5a4dd..b00c3d528 100644
--- a/tests/component/resources_test.cpp
+++ b/tests/component/resources_test.cpp
@@ -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")) {
diff --git a/tests/res-testdata/res-hdpi b/tests/res-testdata/res-hdpi
new file mode 120000
index 000000000..c339b1df4
--- /dev/null
+++ b/tests/res-testdata/res-hdpi
@@ -0,0 +1 @@
+../../res-hdpi \ No newline at end of file
diff --git a/tests/res-testdata/res-mdpi b/tests/res-testdata/res-mdpi
new file mode 120000
index 000000000..4be630d6f
--- /dev/null
+++ b/tests/res-testdata/res-mdpi
@@ -0,0 +1 @@
+../../res-mdpi \ No newline at end of file
diff --git a/tests/res-testdata/res-xhdpi b/tests/res-testdata/res-xhdpi
new file mode 120000
index 000000000..429eead83
--- /dev/null
+++ b/tests/res-testdata/res-xhdpi
@@ -0,0 +1 @@
+../../res-xhdpi \ No newline at end of file
diff --git a/tests/res-testdata/res-xxhdpi b/tests/res-testdata/res-xxhdpi
new file mode 120000
index 000000000..304cc28b3
--- /dev/null
+++ b/tests/res-testdata/res-xxhdpi
@@ -0,0 +1 @@
+../../res-xxhdpi \ No newline at end of file
diff --git a/tests/res-testdata/res-xxxhdpi b/tests/res-testdata/res-xxxhdpi
new file mode 120000
index 000000000..2236ad8cc
--- /dev/null
+++ b/tests/res-testdata/res-xxxhdpi
@@ -0,0 +1 @@
+../../res-xxxhdpi \ No newline at end of file