commit b2dfc0182a52bb92e3b27007b848fda45c5cc68d
author Tianjie Xu <xunchang@google.com> Fri Mar 03 21:53:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 21:53:10 2017 +0000
tree cc92280359f23189e26bae1e668c68d869948bbc
parent 685391c5e90b69095a11a6f3b3e0854d75e1f78b
parent 536989892c5035872b9891e888a4f0d96037ea60

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

Change-Id: I457f30c36fde0dd407a9684fbc7c2d68ac2b94c0

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;