summaryrefslogtreecommitdiffstats
path: root/tests/component
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-04-05 17:51:36 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-04-05 17:51:36 +0200
commit8ce8affee87b19b1229282c8739b8d6679ba415b (patch)
tree9491bad27750c7905a43ba877c3ac508528a67f2 /tests/component
parentMerge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 (diff)
parentMerge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 (diff)
downloadandroid_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar.gz
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar.bz2
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar.lz
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar.xz
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.tar.zst
android_bootable_recovery-8ce8affee87b19b1229282c8739b8d6679ba415b.zip
Diffstat (limited to 'tests/component')
-rw-r--r--tests/component/bootloader_message_test.cpp5
-rw-r--r--tests/component/uncrypt_test.cpp5
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/component/bootloader_message_test.cpp b/tests/component/bootloader_message_test.cpp
index 0357accfe..b38bc7134 100644
--- a/tests/component/bootloader_message_test.cpp
+++ b/tests/component/bootloader_message_test.cpp
@@ -21,14 +21,13 @@
#include <bootloader_message/bootloader_message.h>
#include <gtest/gtest.h>
-#include "common/component_test_util.h"
-
class BootloaderMessageTest : public ::testing::Test {
protected:
BootloaderMessageTest() : has_misc(true) {}
virtual void SetUp() override {
- has_misc = parse_misc();
+ std::string err;
+ has_misc = !get_bootloader_message_blk_device(&err).empty();
}
virtual void TearDown() override {
diff --git a/tests/component/uncrypt_test.cpp b/tests/component/uncrypt_test.cpp
index 5e057e129..3925236a5 100644
--- a/tests/component/uncrypt_test.cpp
+++ b/tests/component/uncrypt_test.cpp
@@ -30,8 +30,6 @@
#include <bootloader_message/bootloader_message.h>
#include <gtest/gtest.h>
-#include "common/component_test_util.h"
-
using namespace std::string_literals;
static const std::string UNCRYPT_SOCKET = "/dev/socket/uncrypt";
@@ -65,7 +63,8 @@ class UncryptTest : public ::testing::Test {
ASSERT_TRUE(success) << "uncrypt service is not available.";
- has_misc = parse_misc();
+ std::string err;
+ has_misc = !get_bootloader_message_blk_device(&err).empty();
}
void SetupOrClearBcb(bool isSetup, const std::string& message,