sandbox tests: Adapt test expectations to new CHECK() behavior

sandbox/linux/syscall_broker/broker_file_permission_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/linux/syscall_broker/broker_file_permission.h"
 
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 28 matching lines @@
 SANDBOX_TEST(BrokerFilePermission, CreateGood) {
   const char kPath[] = "/tmp/good";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnly(kPath);
 }
 
 SANDBOX_TEST(BrokerFilePermission, CreateGoodRecursive) {
   const char kPath[] = "/tmp/good/";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnlyRecursive(kPath);
 }
 
-#if defined(OS_ANDROID) && defined(OFFICIAL_BUILD) && defined(NDEBUG)
-#define DEATH_BY_SIGILL(msg) DEATH_BY_SIGNAL(SIGILL)
+// In official builds, CHECK(x) causes a SIGTRAP on the architectures where the
+// sanbox is enabled (that are x86, x86_64, arm64 and 32-bit arm processes
+// running on a arm64 kernel).
+#if defined(OFFICIAL_BUILD)
+#define DEATH_BY_CHECK(msg) DEATH_BY_SIGNAL(SIGTRAP)
 #else
-#define DEATH_BY_SIGILL(msg) DEATH_MESSAGE(msg)
+#define DEATH_BY_CHECK(msg) DEATH_MESSAGE(msg)
 #endif
 
 SANDBOX_DEATH_TEST(
     BrokerFilePermission,
     CreateBad,
-    DEATH_BY_SIGILL(BrokerFilePermissionTester::GetErrorMessage())
-) {
+    DEATH_BY_CHECK(BrokerFilePermissionTester::GetErrorMessage())) {
   const char kPath[] = "/tmp/bad/";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnly(kPath);
 }
 
 SANDBOX_DEATH_TEST(
     BrokerFilePermission,
     CreateBadRecursive,
-    DEATH_BY_SIGILL(BrokerFilePermissionTester::GetErrorMessage())
-) {
+    DEATH_BY_CHECK(BrokerFilePermissionTester::GetErrorMessage())) {
   const char kPath[] = "/tmp/bad";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnlyRecursive(kPath);
 }
 
 SANDBOX_DEATH_TEST(
     BrokerFilePermission,
     CreateBadNotAbs,
-    DEATH_BY_SIGILL(BrokerFilePermissionTester::GetErrorMessage())
-) {
+    DEATH_BY_CHECK(BrokerFilePermissionTester::GetErrorMessage())) {
   const char kPath[] = "tmp/bad";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnly(kPath);
 }
 
 SANDBOX_DEATH_TEST(
     BrokerFilePermission,
     CreateBadEmpty,
-    DEATH_BY_SIGILL(BrokerFilePermissionTester::GetErrorMessage())
-) {
+    DEATH_BY_CHECK(BrokerFilePermissionTester::GetErrorMessage())) {
   const char kPath[] = "";
   BrokerFilePermission perm = BrokerFilePermission::ReadOnly(kPath);
 }
 
 // CheckPerm tests |path| against |perm| given |access_flags|.
 // If |create| is true then file creation is tested for success.
 void CheckPerm(const BrokerFilePermission& perm,
                const char* path,
                int access_flags,
                bool create) {
@@ skipping 166 matching lines @@
   EXPECT_FALSE(BrokerFilePermissionTester::ValidatePath("/bad/.."));
   EXPECT_FALSE(BrokerFilePermissionTester::ValidatePath("/bad/../bad"));
   EXPECT_FALSE(BrokerFilePermissionTester::ValidatePath("/../bad"));
 }
 
 }  // namespace
 
 }  // namespace syscall_broker
 
 }  // namespace sandbox