commit 443cb20b45a297d987645c3ad5ac1759c1855294
author Calin Juravle <calin@google.com> Wed Oct 29 17:48:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 29 17:48:05 2014 +0000
tree 23a5b93a70a10791e0b8a82d1d9ef8478702d2c0
parent 013a2125432a12ff870354fb1e98f358d9521e63
parent 83c29aea2f72d10fd2ba027a239f8b4edf8c23c8

am 83c29aea: resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp

* commit '83c29aea2f72d10fd2ba027a239f8b4edf8c23c8':
  Handle code_cache dir creation in libnativebridge

libnativebridge/tests/CompleteFlow_test.cpp

diff --git a/libnativebridge/tests/CompleteFlow_test.cpp b/libnativebridge/tests/CompleteFlow_test.cpp
index cf06d2c..05f5304 100644
--- a/libnativebridge/tests/CompleteFlow_test.cpp
+++ b/libnativebridge/tests/CompleteFlow_test.cpp
@@ -36,11 +36,14 @@
 
     // Unload
     UnloadNativeBridge();
+
     ASSERT_FALSE(NativeBridgeAvailable());
     ASSERT_FALSE(NativeBridgeError());
 
     // Clean-up code_cache
     ASSERT_EQ(0, rmdir(kCodeCache));
+
+    ASSERT_FALSE(NativeBridgeError());
 }
 
 }  // namespace android