diff options
author | 2014-11-06 01:00:46 -0800 | |
---|---|---|
committer | 2014-11-18 17:26:06 -0800 | |
commit | 4303ba97313458491e038d78efa041d41cf7bb43 (patch) | |
tree | 5a5873651db918416c9ff63f4bb06b6eb7f4c71a /compiler/image_test.cc | |
parent | a971100be7870544360fa8a46311ef7f5adb6902 (diff) |
ART: Track Flush & Close in FdFile
Implement a check that aborts when a file hasn't been explicitly
flushed and closed when it is destructed.
Add WARN_UNUSED to FdFile methods.
Update dex2oat, patchoat, scoped_flock and some gtests to pass with
this.
(cherry picked from commit 9433ec60b325b708b9fa87e699ab4a6565741494)
Change-Id: I9ab03b1653e69f44cc98946dc89d764c3e045dd4
Diffstat (limited to 'compiler/image_test.cc')
-rw-r--r-- | compiler/image_test.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 7e2be3ee0c..dac1ef4c06 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -105,13 +105,16 @@ TEST_F(ImageTest, WriteRead) { ASSERT_TRUE(success_image); bool success_fixup = ElfWriter::Fixup(dup_oat.get(), writer->GetOatDataBegin()); ASSERT_TRUE(success_fixup); + + ASSERT_EQ(dup_oat->FlushCloseOrErase(), 0) << "Could not flush and close oat file " + << oat_file.GetFilename(); } { std::unique_ptr<File> file(OS::OpenFileForReading(image_file.GetFilename().c_str())); ASSERT_TRUE(file.get() != NULL); ImageHeader image_header; - file->ReadFully(&image_header, sizeof(image_header)); + ASSERT_EQ(file->ReadFully(&image_header, sizeof(image_header)), true); ASSERT_TRUE(image_header.IsValid()); ASSERT_GE(image_header.GetImageBitmapOffset(), sizeof(image_header)); ASSERT_NE(0U, image_header.GetImageBitmapSize()); |