[Mac/GN] Run browser_tests.

BUG=431177 [email protected] Review URL: https://codereview.chromium.org/1976643002 . Cr-Commit-Position: refs/heads/master@{#393398}
wuhengzhi · May 12, 2016 · 628b507 · 628b507
1 parent 84146c7
commit 628b507
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -637,6 +637,24 @@ if (is_win) {
     }
   }
 
+  if (enable_nacl) {
+    bundle_data("chrome_framework_plugins") {
+      sources = []
+      outputs = [
+        "{{bundle_root_dir}}/Internet Plug-Ins/{{source_file_part}}",
+      ]
+      public_deps = []
+
+      if (enable_nacl) {
+        sources += [ "$root_out_dir/nacl_irt_x86_64.nexe" ]
+        public_deps += [ "//ppapi/native_client:irt" ]
+      }
+    }
+  } else {
+    group("chrome_framework_plugins") {
+    }
+  }
+
   tweak_info_plist("chrome_framework_plist") {
     info_plist = "app/framework-Info.plist"
     args = [
@@ -726,6 +744,7 @@ if (is_win) {
     deps = [
       ":chrome_framework_helpers",
       ":chrome_framework_locales",
+      ":chrome_framework_plugins",
       ":chrome_framework_resources",
       "//build/config/sanitizers:deps",
       "//chrome/app/nibs:chrome_xibs",

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -712,6 +712,7 @@ if (!is_android) {
         # TODO(rouslan): This test depends on hunspell and we cannot run it
         # on Mac, which does not use hunspell by default.
         "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js",
+        "../browser/ui/webui/options/multilanguage_options_webui_browsertest.js",
       ]
     }
     if (!enable_app_list) {
@@ -887,7 +888,6 @@ if (!is_android) {
       "$root_out_dir/chrome_material_100_percent.pak",
       "$root_out_dir/chrome_200_percent.pak",
       "$root_out_dir/chrome_material_200_percent.pak",
-      "$root_out_dir/locales/",
       "$root_out_dir/remoting/unittests/",
       "$root_out_dir/resources/extension/",
       "$root_out_dir/test_case.html",
@@ -981,6 +981,7 @@ if (!is_android) {
     ]
 
     if (!is_mac) {
+      data += [ "$root_out_dir/locales/" ]
       data_deps += [ "//chrome:packed_extra_resources" ]
     }
 
@@ -1241,6 +1242,19 @@ if (!is_android) {
         "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc",
       ]
 
+      data_deps += [
+        "//chrome",
+        "//chrome:chrome_framework",
+      ]
+
+      # TODO(rsesek): Remove once https://crbug.com/611414 is fixed.
+      data += [
+        "$root_out_dir/Chromium.app/",
+        "$root_out_dir/Chromium Framework.framework/",
+        "$root_out_dir/power_saver_test_plugin.plugin/",
+        "$root_out_dir/ppapi_tests.plugin/",
+      ]
+
       # The browser window can be views or Cocoa on Mac. Test accordingly.
       if (mac_views_browser) {
         sources += rebase_path(

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -28,6 +28,12 @@
         },
         "test": "battor_agent_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "browser_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -299,6 +305,12 @@
         },
         "test": "battor_agent_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "browser_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true