diff options
| author | Sen Jiang <senj@google.com> | 2016-03-30 14:01:02 -0700 |
|---|---|---|
| committer | Sen Jiang <senj@google.com> | 2016-03-31 00:48:39 +0000 |
| commit | ee63c6ecf2487eaaeb80c37a70e0f7248d026ca8 (patch) | |
| tree | 1503ed7b2fe47ecc98eb6bcccd40b163e1ef6f64 | |
| parent | 2494e28b88a819618c6325a5b081ef7de28549ee (diff) | |
Fix DeltaPerformerTest.ConfVersionsMatch.
Install update_engine.conf to nativetests.
Test: GTEST_FILTER="*ConfVersion*" ./update_engine_unittests
Bug: 26955860
Change-Id: Ia73a8ddaf2b4a46bfbf5ea6034ec4998ec3b8e35
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | payload_consumer/delta_performer_unittest.cc | 2 |
2 files changed, 12 insertions, 1 deletions
@@ -756,6 +756,16 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests LOCAL_PREBUILT_MODULE_FILE := $(TARGET_OUT_COMMON_GEN)/zlib_fingerprint include $(BUILD_PREBUILT) +# update_engine.conf +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := ue_unittest_update_engine.conf +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests +LOCAL_MODULE_STEM := update_engine.conf +LOCAL_SRC_FILES := update_engine.conf +include $(BUILD_PREBUILT) + # test_http_server (type: executable) # ======================================================== # Test HTTP Server. @@ -795,6 +805,7 @@ LOCAL_REQUIRED_MODULES := \ ue_unittest_key.pub.pem \ ue_unittest_key2.pem \ ue_unittest_key2.pub.pem \ + ue_unittest_update_engine.conf \ zlib_fingerprint LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_CPP_EXTENSION := .cc diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc index 9f1aed32..3a811f05 100644 --- a/payload_consumer/delta_performer_unittest.cc +++ b/payload_consumer/delta_performer_unittest.cc @@ -892,7 +892,7 @@ TEST_F(DeltaPerformerTest, ConfVersionsMatch) { // image match the supported delta versions in the update engine. uint32_t minor_version; brillo::KeyValueStore store; - EXPECT_TRUE(store.Load(base::FilePath("update_engine.conf"))); + EXPECT_TRUE(store.Load(GetBuildArtifactsPath().Append("update_engine.conf"))); EXPECT_TRUE(utils::GetMinorVersion(store, &minor_version)); EXPECT_EQ(DeltaPerformer::kSupportedMinorPayloadVersion, minor_version); |