commit a004aa933a58428489e42d77f707c2b063b73747
author Brian Carlstrom <bdc@google.com> Wed Feb 08 18:05:09 2012 -0800
committer Brian Carlstrom <bdc@google.com> Thu Feb 16 17:48:28 2012 -0800
tree 1224764c4a524957e94dfe2d27e277d024986668
parent 573b7c9324b11ff7f42f68c9ad52d26ebc4b6d12

user build support for art (2 of 3)

Change-Id: I4696fee58e43db48540e2442c4235fc4bb02d9e3

src/image_test.cc

diff --git a/src/image_test.cc b/src/image_test.cc
index 97d37c5..fb87a49 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -33,7 +33,7 @@
 TEST_F(ImageTest, WriteRead) {
   ScratchFile tmp_oat;
   std::vector<const DexFile*> dex_files;
-  dex_files.push_back(java_lang_dex_file_.get());
+  dex_files.push_back(java_lang_dex_file_);
   bool success_oat = OatWriter::Create(tmp_oat.GetFile(), NULL, dex_files, *compiler_.get());
   ASSERT_TRUE(success_oat);
 
@@ -49,11 +49,11 @@
   ScratchFile tmp_image;
   const uintptr_t requested_image_base = 0x60000000;
   bool success_image = writer.Write(tmp_image.GetFilename(), requested_image_base,
-                                    std::string(tmp_oat.GetFilename()), "");
+                                    tmp_oat.GetFilename(), tmp_oat.GetFilename());
   ASSERT_TRUE(success_image);
 
   {
-    UniquePtr<File> file(OS::OpenFile(tmp_image.GetFilename(), false));
+    UniquePtr<File> file(OS::OpenFile(tmp_image.GetFilename().c_str(), false));
     ASSERT_TRUE(file.get() != NULL);
     ImageHeader image_header;
     file->ReadFully(&image_header, sizeof(image_header));
@@ -68,12 +68,9 @@
 
   // tear down old runtime before making a new one, clearing out misc state
   delete runtime_.release();
+  java_lang_dex_file_ = NULL;
 
-  // don't reuse java_lang_dex_file_ so we make sure we don't get
-  // lucky by pointers that happen to work referencing the earlier
-  // dex.
-  delete java_lang_dex_file_.release();
-  UniquePtr<const DexFile> dex(DexFile::Open(GetLibCoreDexFileName(), ""));
+  UniquePtr<const DexFile> dex(DexFile::Open(GetLibCoreDexFileName(), GetLibCoreDexFileName()));
   ASSERT_TRUE(dex.get() != NULL);
 
   Runtime::Options options;