Clean up testing of instructions. Allow testing to quit if test pattern tests

src/trusted/validator_arm/actual_vs_baseline.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef NACL_TRUSTED_BUT_NOT_TCB
 #error This file is not meant for use in the TCB
 #endif
 
@@ skipping 26 matching lines @@
   CheckBaseAddressRegister();
   CheckOffsetIsImmediate();
   CheckBranchTargetRegister();
   CheckIsRelativeBranch();
   CheckBranchTargetOffset();
   CheckIsLiteralPoolHead();
   CheckClearsBits();
   CheckSetsZIfBitsClear();
 }
 
-void ActualVsBaselineTester::ApplySanityChecks(
+bool ActualVsBaselineTester::ApplySanityChecks(
       nacl_arm_dec::Instruction inst,
       const NamedClassDecoder& decoder) {
   UNREFERENCED_PARAMETER(inst);
   UNREFERENCED_PARAMETER(decoder);
-  GTEST_FAIL() << "Sanity Checks shouldn't be applied!";
+  EXPECT_TRUE(false) << "Sanity Checks shouldn't be applied!";
+  return false;
 }
 
 const NamedClassDecoder& ActualVsBaselineTester::ExpectedDecoder() const {
   return baseline_;
 }
 
 void ActualVsBaselineTester::CheckSafety() {
   // Note: We don't actually check if safety is identical. All we worry
   // about is that the validator (in sel_ldr) accepts/rejects the same
   // way in terms of safety. We don't worry if the reasons for safety
@@ skipping 79 matching lines @@
   // Note: We don't actually test all combinations of masks. We just
   // try a few.
   for (uint32_t i = 0; i < 15; ++i) {
     nacl_arm_dec::Register r(i);
     EXPECT_EQ(baseline_decoder_.sets_Z_if_bits_clear(inst_, r, data24_mask),
               actual_decoder_.sets_Z_if_bits_clear(inst_, r, data24_mask));
   }
 }
 
 }  // namespace