commit c83e7fe38da1e94fa98f05454d96c38f5de639a4
author Vladimir Marko <vmarko@google.com> Mon Apr 09 13:30:58 2018 +0100
committer Vladimir Marko <vmarko@google.com> Mon Apr 09 13:33:29 2018 +0100
tree 829a1de3a342fccc4f4798d063ef1a17a4fef7f7
parent 1451f86cce740befd52cb3665827aafef1497f54

Fix oat_file_assistant_test.

Change a few EXPECT_EQ()s to ASSERT_EQ()s to avoid SIGSEGV
in a following EXPECT_*() hiding the first error message.

Test: Rely on TreeHugger.
Bug: 77787955
Change-Id: Ibd9ddb3b869b5cd2d6a915eb69557c726a7794d6

runtime/oat_file_assistant_test.cc

diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc
index 676071b..99bc0b2 100644
--- a/runtime/oat_file_assistant_test.cc
+++ b/runtime/oat_file_assistant_test.cc
@@ -1487,7 +1487,7 @@
                                         true,
                                         false);
     int status = oat_file_assistant.MakeUpToDate(false, kSpecialSharedLibraryContext, &error_msg);
-    EXPECT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
+    ASSERT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
     EXPECT_TRUE(oat_file_assistant.GetBestOatFile()->IsExecutable());
   }
 
@@ -1497,7 +1497,7 @@
                                         true,
                                         true);
     int status = oat_file_assistant.MakeUpToDate(false, kSpecialSharedLibraryContext, &error_msg);
-    EXPECT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
+    ASSERT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
     EXPECT_FALSE(oat_file_assistant.GetBestOatFile()->IsExecutable());
   }
 
@@ -1510,7 +1510,7 @@
                                         true,
                                         false);
     int status = oat_file_assistant.MakeUpToDate(false, kSpecialSharedLibraryContext, &error_msg);
-    EXPECT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
+    ASSERT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
     EXPECT_TRUE(oat_file_assistant.GetBestOatFile()->IsExecutable());
   }
 
@@ -1520,7 +1520,7 @@
                                         true,
                                         true);
     int status = oat_file_assistant.MakeUpToDate(false, kSpecialSharedLibraryContext, &error_msg);
-    EXPECT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
+    ASSERT_EQ(OatFileAssistant::kUpdateSucceeded, status) << error_msg;
     EXPECT_TRUE(oat_file_assistant.GetBestOatFile()->IsExecutable());
   }
 }