Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab

am: 536989892c Change-Id: I457f30c36fde0dd407a9684fbc7c2d68ac2b94c0
2017-03-03 21:53:10 +00:00
parent 685391c5e9 536989892c
commit b2dfc0182a
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;