diff options
author | Tianjie Xu <xunchang@google.com> | 2017-03-01 04:29:22 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-01 04:29:22 +0100 |
commit | 6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76 (patch) | |
tree | fcf4815fbafad5d14334b77c2ce0f6285f2bfed9 /tests/component/uncrypt_test.cpp | |
parent | Merge "recovery: Remember the last log position." am: d549616b24 (diff) | |
parent | Merge "Skip BootloaderMessageTest, UncryptTest for devices without /misc" (diff) | |
download | android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar.gz android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar.bz2 android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar.lz android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar.xz android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.tar.zst android_bootable_recovery-6b0959a6bb4b3da4b7f5961f82e6b72ee20dbe76.zip |
Diffstat (limited to 'tests/component/uncrypt_test.cpp')
-rw-r--r-- | tests/component/uncrypt_test.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/component/uncrypt_test.cpp b/tests/component/uncrypt_test.cpp index a554c3e48..4f2b8164f 100644 --- a/tests/component/uncrypt_test.cpp +++ b/tests/component/uncrypt_test.cpp @@ -29,6 +29,8 @@ #include <bootloader_message/bootloader_message.h> #include <gtest/gtest.h> +#include "common/component_test_util.h" + static const std::string UNCRYPT_SOCKET = "/dev/socket/uncrypt"; static const std::string INIT_SVC_SETUP_BCB = "init.svc.setup-bcb"; static const std::string INIT_SVC_CLEAR_BCB = "init.svc.clear-bcb"; @@ -37,7 +39,9 @@ static constexpr int SOCKET_CONNECTION_MAX_RETRY = 30; class UncryptTest : public ::testing::Test { protected: - virtual void SetUp() { + UncryptTest() : has_misc(true) {} + + virtual void SetUp() override { ASSERT_TRUE(android::base::SetProperty("ctl.stop", "setup-bcb")); ASSERT_TRUE(android::base::SetProperty("ctl.stop", "clear-bcb")); ASSERT_TRUE(android::base::SetProperty("ctl.stop", "uncrypt")); @@ -57,10 +61,19 @@ class UncryptTest : public ::testing::Test { } ASSERT_TRUE(success) << "uncrypt service is not available."; + + has_misc = parse_misc(); } + + bool has_misc; }; TEST_F(UncryptTest, setup_bcb) { + if (!has_misc) { + GTEST_LOG_(INFO) << "Test skipped due to no /misc partition found on the device."; + return; + } + // Trigger the setup-bcb service. ASSERT_TRUE(android::base::SetProperty("ctl.start", "setup-bcb")); @@ -126,6 +139,11 @@ TEST_F(UncryptTest, setup_bcb) { } TEST_F(UncryptTest, clear_bcb) { + if (!has_misc) { + GTEST_LOG_(INFO) << "Test skipped due to no /misc partition found on the device."; + return; + } + // Trigger the clear-bcb service. ASSERT_TRUE(android::base::SetProperty("ctl.start", "clear-bcb")); |