Merge "ART: Make assembler_test less chatty"

1 files changed, 5 insertions, 2 deletions

diff --git a/compiler/utils/assembler_test.h b/compiler/utils/assembler_test.h
index 05ac70ed74..37429131ef 100644
--- a/compiler/utils/assembler_test.h
+++ b/compiler/utils/assembler_test.h
@@ -361,12 +361,15 @@ class AssemblerTest : public testing::Test {
     } else {
       if (DisassembleBinaries(*data, *res.code, test_name)) {
         if (data->size() > res.code->size()) {
-          LOG(WARNING) << "Assembly code is not identical, but disassembly of machine code is "
-              "equal: this implies sub-optimal encoding! Our code size=" << data->size() <<
+          // Fail this test with a fancy colored warning being printed.
+          EXPECT_TRUE(false) << "Assembly code is not identical, but disassembly of machine code "
+              "is equal: this implies sub-optimal encoding! Our code size=" << data->size() <<
               ", gcc size=" << res.code->size();
         } else {
+          // Otherwise just print an info message and clean up.
           LOG(INFO) << "GCC chose a different encoding than ours, but the overall length is the "
               "same.";
+          Clean(&res);
         }
       } else {
         // This will output the assembly.