commit 9515b51c6ae1ad9c8b0a9d07334ef62af16cec6a
author Yi Kong <yikong@google.com> Wed Nov 11 14:36:07 2015 +0000
committer Yi Kong <yikong@google.com> Mon Nov 16 13:55:53 2015 +0000
tree 316fb0cf6069003943417ddf1bfde7d3ffe028eb
parent 336eee4a049b736c94d5116ddf4c292aa8864570

Fix oat_test

by reducing the DexFileCount test condition from static to dynamically
determined.

Change-Id: I3d97009a1ebfbe3ac9d41f0cdd508db0155660f8

compiler/oat_test.cc

diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc
index 0747756..618aab0 100644
--- a/compiler/oat_test.cc
+++ b/compiler/oat_test.cc
@@ -127,7 +127,7 @@
   ASSERT_TRUE(oat_file.get() != nullptr) << error_msg;
   const OatHeader& oat_header = oat_file->GetOatHeader();
   ASSERT_TRUE(oat_header.IsValid());
-  ASSERT_EQ(1U, oat_header.GetDexFileCount());  // core
+  ASSERT_EQ(class_linker->GetBootClassPath().size(), oat_header.GetDexFileCount());  // core
   ASSERT_EQ(42U, oat_header.GetImageFileLocationOatChecksum());
   ASSERT_EQ(4096U, oat_header.GetImageFileLocationOatDataBegin());
   ASSERT_EQ("lue.art", std::string(oat_header.GetStoreValueByKey(OatHeader::kImageLocationKey)));