summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-03 19:15:07 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-11-03 19:15:07 +0100
commit4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4 (patch)
treedf496b1d676e1c2e265abbc5777ecba1eb3afddd
parentMerge "applypatch: Add testcases for applypatch executable." (diff)
parenttests: Set up testdata path for continuous native tests. (diff)
downloadandroid_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar.gz
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar.bz2
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar.lz
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar.xz
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.tar.zst
android_bootable_recovery-4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4.zip
-rw-r--r--tests/Android.mk21
-rw-r--r--tests/common/test_constants.h15
-rw-r--r--tests/component/applypatch_test.cpp7
-rw-r--r--tests/component/verifier_test.cpp11
4 files changed, 23 insertions, 31 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 461d6ef76..8f19992b6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -87,7 +87,8 @@ LOCAL_STATIC_LIBRARIES := \
testdata_files := $(call find-subdir-files, testdata/*)
-testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/recovery
+# The testdata files that will go to $OUT/data/nativetest/recovery.
+testdata_out_path := $(TARGET_OUT_DATA)/nativetest/recovery
GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
@@ -95,14 +96,16 @@ $(GEN): $(testdata_out_path)/% : $(LOCAL_PATH)/%
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
-ifdef TARGET_2ND_ARCH
-testdata_out_path_2nd_arch := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/recovery
-GEN_2ND_ARCH := $(addprefix $(testdata_out_path_2nd_arch)/, $(testdata_files))
-$(GEN_2ND_ARCH): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN_2ND_ARCH): PRIVATE_CUSTOM_TOOL = cp $< $@
-$(GEN_2ND_ARCH): $(testdata_out_path_2nd_arch)/% : $(LOCAL_PATH)/%
+# A copy of the testdata to be packed into continuous_native_tests.zip.
+testdata_continuous_zip_prefix := \
+ $(call intermediates-dir-for,PACKAGING,recovery_component_test)/DATA
+testdata_continuous_zip_path := $(testdata_continuous_zip_prefix)/nativetest/recovery
+GEN := $(addprefix $(testdata_continuous_zip_path)/, $(testdata_files))
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
+$(GEN): $(testdata_continuous_zip_path)/% : $(LOCAL_PATH)/%
$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN_2ND_ARCH)
-endif # TARGET_2ND_ARCH
+LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_PICKUP_FILES := $(testdata_continuous_zip_prefix)
include $(BUILD_NATIVE_TEST)
diff --git a/tests/common/test_constants.h b/tests/common/test_constants.h
index 3490f6805..97e74a3c2 100644
--- a/tests/common/test_constants.h
+++ b/tests/common/test_constants.h
@@ -13,13 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#ifndef _OTA_TEST_CONSTANTS_H
#define _OTA_TEST_CONSTANTS_H
-#if defined(__LP64__)
-#define NATIVE_TEST_PATH "/nativetest64"
-#else
-#define NATIVE_TEST_PATH "/nativetest"
-#endif
+#include <stdlib.h>
+
+static const char* data_root = getenv("ANDROID_DATA");
+
+static std::string from_testdata_base(const std::string& fname) {
+ return std::string(data_root) + "/nativetest/recovery/testdata/" + fname;
+}
-#endif
+#endif // _OTA_TEST_CONSTANTS_H
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index f95ebed5d..1a0b19113 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -37,9 +37,6 @@
#include "common/test_constants.h"
#include "print_sha1.h"
-static const std::string DATA_PATH = getenv("ANDROID_DATA");
-static const std::string TESTDATA_PATH = "/recovery/testdata";
-
static void sha1sum(const std::string& fname, std::string* sha1, size_t* fsize = nullptr) {
ASSERT_NE(nullptr, sha1);
@@ -72,10 +69,6 @@ static bool file_cmp(const std::string& f1, const std::string& f2) {
return c1 == c2;
}
-static std::string from_testdata_base(const std::string& fname) {
- return DATA_PATH + NATIVE_TEST_PATH + TESTDATA_PATH + "/" + fname;
-}
-
class ApplyPatchTest : public ::testing::Test {
public:
static void SetUpTestCase() {
diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp
index 7f9a71408..60a78f5c3 100644
--- a/tests/component/verifier_test.cpp
+++ b/tests/component/verifier_test.cpp
@@ -37,9 +37,6 @@
#include "ui.h"
#include "verifier.h"
-static const char* DATA_PATH = getenv("ANDROID_DATA");
-static const char* TESTDATA_PATH = "/recovery/testdata/";
-
RecoveryUI* ui = NULL;
class MockUI : public RecoveryUI {
@@ -92,17 +89,13 @@ class VerifierTest : public testing::TestWithParam<std::vector<std::string>> {
virtual void SetUp() {
std::vector<std::string> args = GetParam();
- std::string package =
- android::base::StringPrintf("%s%s%s%s", DATA_PATH, NATIVE_TEST_PATH,
- TESTDATA_PATH, args[0].c_str());
+ std::string package = from_testdata_base(args[0]);
if (sysMapFile(package.c_str(), &memmap) != 0) {
FAIL() << "Failed to mmap " << package << ": " << strerror(errno) << "\n";
}
for (auto it = ++(args.cbegin()); it != args.cend(); ++it) {
- std::string public_key_file = android::base::StringPrintf(
- "%s%s%stestkey_%s.txt", DATA_PATH, NATIVE_TEST_PATH,
- TESTDATA_PATH, it->c_str());
+ std::string public_key_file = from_testdata_base("testkey_" + *it + ".txt");
ASSERT_TRUE(load_keys(public_key_file.c_str(), certs));
}
}