Merge "Fix an error on bootloadermessager test teardown"

am: b694ba8aab Change-Id: I9e32f0468e4d5fb22190d9c64b2804666d8202fb
2017-03-03 21:50:09 +00:00
parent 3d605c54e3 b694ba8aab
commit 536989892c
1 changed files with 4 additions and 2 deletions
--- 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;