commit 6e5c04472de116f80557e1dd3802b59b5ba90d40
author Nicolas Geoffray <ngeoffray@google.com> Mon Jul 17 11:29:41 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jul 17 11:29:41 2017 +0100
tree 607c3355336a63003e1f4b69064b49ed0217a92c
parent d4472455580db696d0f211f8e6f7d99d78b3fa79

Comment out checks on oat files.

We cannot rely on oat file sizes for this test.

bug: 63746626
Test: dex2oat_image_test
Change-Id: I510edc5249afc39de98bb7b91e9c098bc552a615

dex2oat/dex2oat_image_test.cc

diff --git a/dex2oat/dex2oat_image_test.cc b/dex2oat/dex2oat_image_test.cc
index 148af0d..95fb16d 100644
--- a/dex2oat/dex2oat_image_test.cc
+++ b/dex2oat/dex2oat_image_test.cc
@@ -260,7 +260,8 @@
     std::cout << "Compiled all classes sizes " << compiled_all_classes_sizes << std::endl;
     // Check that oat size is smaller since we didn't compile everything.
     EXPECT_EQ(compiled_all_classes_sizes.art_size, base_sizes.art_size);
-    EXPECT_EQ(compiled_all_classes_sizes.oat_size, base_sizes.oat_size);
+    // TODO(mathieuc): Find a reliable way to check compiled code.
+    // EXPECT_EQ(compiled_all_classes_sizes.oat_size, base_sizes.oat_size);
     EXPECT_EQ(compiled_all_classes_sizes.vdex_size, base_sizes.vdex_size);
   }
   // Test compiled classes.
@@ -274,7 +275,8 @@
     classes.Close();
     std::cout << "Compiled classes sizes " << compiled_classes_sizes << std::endl;
     // Check that oat size is smaller since we didn't compile everything.
-    EXPECT_LT(compiled_classes_sizes.oat_size, base_sizes.oat_size);
+    // TODO(mathieuc): Find a reliable way to check compiled code.
+    // EXPECT_LT(compiled_classes_sizes.oat_size, base_sizes.oat_size);
     // Art file should be smaller than image classes version since we included fewer classes in the
     // list.
     EXPECT_LT(compiled_classes_sizes.art_size, image_classes_sizes.art_size);
@@ -289,7 +291,8 @@
     methods.Close();
     std::cout << "Compiled all methods sizes " << compiled_all_methods_sizes << std::endl;
     EXPECT_EQ(compiled_all_classes_sizes.art_size, base_sizes.art_size);
-    EXPECT_EQ(compiled_all_classes_sizes.oat_size, base_sizes.oat_size);
+    // TODO(mathieuc): Find a reliable way to check compiled code. b/63746626
+    // EXPECT_EQ(compiled_all_classes_sizes.oat_size, base_sizes.oat_size);
     EXPECT_EQ(compiled_all_classes_sizes.vdex_size, base_sizes.vdex_size);
   }
   static size_t kMethodFrequency = 3;
@@ -329,10 +332,12 @@
     // the range is within expected margins (+-5%).
     const double kRatio = 0.95;
     EXPECT_LE(profile_sizes.art_size * kRatio, compiled_methods_sizes.art_size);
-    EXPECT_LE(profile_sizes.oat_size * kRatio, compiled_methods_sizes.oat_size);
+    // TODO(mathieuc): Find a reliable way to check compiled code. b/63746626
+    // EXPECT_LE(profile_sizes.oat_size * kRatio, compiled_methods_sizes.oat_size);
     EXPECT_LE(profile_sizes.vdex_size * kRatio, compiled_methods_sizes.vdex_size);
     EXPECT_GE(profile_sizes.art_size / kRatio, compiled_methods_sizes.art_size);
-    EXPECT_GE(profile_sizes.oat_size / kRatio, compiled_methods_sizes.oat_size);
+    // TODO(mathieuc): Find a reliable way to check compiled code. b/63746626
+    // EXPECT_GE(profile_sizes.oat_size / kRatio, compiled_methods_sizes.oat_size);
     EXPECT_GE(profile_sizes.vdex_size / kRatio, compiled_methods_sizes.vdex_size);
   }
 }