diff options
| author | Tao Bao <tbao@google.com> | 2017-04-05 17:40:58 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-05 17:40:59 +0200 |
| commit | 3cd630a5a8d5a19dda9429af5494f19625bc2fa0 (patch) | |
| tree | 4ace1cad9d4d12c35e9c3cb69ee24060c7740e74 /tests/component | |
| parent | Merge "Boot control HAL based on the A/B headers." (diff) | |
| parent | tests: Use get_bootloader_message_blk_device() to find /misc. (diff) | |
| download | android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar.gz android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar.bz2 android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar.lz android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar.xz android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.tar.zst android_bootable_recovery-3cd630a5a8d5a19dda9429af5494f19625bc2fa0.zip | |
Diffstat (limited to 'tests/component')
| -rw-r--r-- | tests/component/bootloader_message_test.cpp | 5 | ||||
| -rw-r--r-- | tests/component/uncrypt_test.cpp | 5 |
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, |