🍬 GN: Make breakpad_unittests & sandbox_linux_unittests use test()

build/config/android/internal_rules.gni

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 2055 matching lines @@
 
   action(target_name) {
     script = "//build/android/gyp/create_test_runner_script.py"
     depfile = "$target_gen_dir/$target_name.d"
     deps = []
 
     datadeps = [
       "//build/android:test_runner_py",
     ]
 
+    test_runner_args = [
+      _test_type,
+      "--output-directory",
+      rebase_path(root_build_dir, root_build_dir),
+    ]
+
     # apk_target is not used for native executable tests
     # (e.g. breakpad_unittests).
     if (defined(invoker.apk_target)) {
+      assert(!defined(invoker.executable))
       deps += [ "${invoker.apk_target}__build_config" ]
       _apk_build_config =
           get_label_info(invoker.apk_target, "target_gen_dir") + "/" +
           get_label_info(invoker.apk_target, "name") + ".build_config"
       _rebased_apk_build_config = rebase_path(_apk_build_config, root_build_dir)
       assert(_rebased_apk_build_config != "")  # Mark as used.
+    } else if (_test_type == "gtest") {
+      assert(
+          defined(invoker.executable),
+          "Must defined either apk_target or executable for test_runner_script()")

[jbudorick, 2016/03/30 19:33:38]

nit: s/defined/define/

[agrieve, 2016/03/30 19:52:57]

Done.

+      test_runner_args += [
+        "--executable-path",
+        rebase_path(invoker.executable, root_build_dir),
+      ]
     }
 
-    test_runner_args = [
-      _test_type,
-      "--output-directory",
-      rebase_path(root_build_dir, root_build_dir),
-    ]
     if (_test_type == "gtest") {
       assert(defined(invoker.test_suite))
       test_runner_args += [
         "--suite",
         invoker.test_suite,
       ]
     } else if (_test_type == "instrumentation") {
       _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:apk_path)"
       if (_incremental_install) {
         _test_apk = "@FileArg($_rebased_apk_build_config:deps_info:incremental_apk_path)"
@@ skipping 73 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }