commit cf060bc36e3d34c6a04a50b340814987d4e70e8e
author David Drysdale <drysdale@google.com> Thu Oct 02 11:05:57 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Oct 23 09:06:25 2014
tree b31d407450c9f93ffa7f3db9e649067b96fc5cfa
parent 19992572b252bcda0d4153d088465ba3decca3f1

chaps: Disable :memory: tests if libmemenv not present

BUG=None
TEST=Chaps unit tests (with ASAN) plus PKCS11 tests

Change-Id: I163c73353c259106eaff6060bbd272dc1fbf167f
Reviewed-on: https://chromium-review.googlesource.com/221936
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Commit-Queue: David Drysdale <drysdale@google.com>
Tested-by: David Drysdale <drysdale@google.com>

chaps/object_store_test.cc

diff --git a/chaps/object_store_test.cc b/chaps/object_store_test.cc
index 30aafdf..f5d1298 100644
--- a/chaps/object_store_test.cc
+++ b/chaps/object_store_test.cc
@@ -120,6 +120,7 @@
   EXPECT_FALSE(encrypted_block1 == encrypted_block2);
 }
 
+#ifndef NO_MEMENV
 TEST(TestObjectStore, InsertLoad) {
   ObjectStoreImpl store;
   const FilePath::CharType database[] = FILE_PATH_LITERAL(":memory:");
@@ -224,6 +225,7 @@
   EXPECT_TRUE(store.GetInternalBlob(1, &internal));
   EXPECT_EQ("internal", internal);
 }
+#endif
 
 }  // namespace chaps