From cace743c4db6e73bc8ff3a0eee1f8f2044054ca7 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Fri, 3 Mar 2017 11:28:49 -0800
Subject: Fix an error on bootloadermessager test teardown

The test should not clear bcb during teardown on devices without
/misc.

Bug: 35712836
Test: The test tears down without errors after /misc removed from the fstab.
Change-Id: I42df89feb18fac5a435cd17eef97a6bad0f44545
---
 tests/component/bootloader_message_test.cpp | 6 ++++--
 1 file 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;
-- 
cgit v1.2.3