summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-03-03 22:53:10 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-03 22:53:10 +0100
commitb2dfc0182a52bb92e3b27007b848fda45c5cc68d (patch)
treecc92280359f23189e26bae1e668c68d869948bbc
parentMerge "Recovery Test: add SideloadTest to test FUSE support on target" am: 53feebea4f (diff)
parentMerge "Fix an error on bootloadermessager test teardown" (diff)
downloadandroid_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar.gz
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar.bz2
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar.lz
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar.xz
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.tar.zst
android_bootable_recovery-b2dfc0182a52bb92e3b27007b848fda45c5cc68d.zip
-rw-r--r--tests/component/bootloader_message_test.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/component/bootloader_message_test.cpp b/tests/component/bootloader_message_test.cpp
index c32519d80..0357accfe 100644
--- a/tests/component/bootloader_message_test.cpp
+++ b/tests/component/bootloader_message_test.cpp
@@ -33,8 +33,10 @@ class BootloaderMessageTest : public ::testing::Test {
virtual void TearDown() override {
// Clear the BCB.
- std::string err;
- ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
+ if (has_misc) {
+ std::string err;
+ ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
+ }
}
bool has_misc;