commit b694ba8aab0e60b530beaeb079017ec2cf0ad10a
author Tianjie Xu <xunchang@google.com> Fri Mar 03 21:43:13 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 03 21:43:14 2017 +0000
tree 759fae02c0d04e051b1187982001becf3104caf2
parent 53feebea4f1244e2cc404fded80141a958447943
parent cace743c4db6e73bc8ff3a0eee1f8f2044054ca7

Merge "Fix an error on bootloadermessager test teardown"

tests/component/bootloader_message_test.cpp

diff --git a/tests/component/bootloader_message_test.cpp b/tests/component/bootloader_message_test.cpp
index c32519d..0357acc 100644
--- a/tests/component/bootloader_message_test.cpp
+++ b/tests/component/bootloader_message_test.cpp
@@ -33,8 +33,10 @@
 
   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;