[Mac/GN] Start running components_unittests, components_browsertests,…

… and unit_tests. BUG=431177 R=dpranke@chromium.org Review-Url: https://codereview.chromium.org/1944943003 Cr-Commit-Position: refs/heads/master@{#392362}
Denger-Network · May 9, 2016 · 40f9bc3 · 40f9bc3
1 parent f9227fb
commit 40f9bc3
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 7 deletions.
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -327,6 +327,8 @@ if (!is_android) {
 
     configs += [ "//build/config:precompiled_headers" ]
 
+    data_deps = []
+
     data = [
       "data/",
       "//content/test/data/",
@@ -342,7 +344,6 @@ if (!is_android) {
       "//third_party/zlib/google/test/data/",
       "//tools/metrics/histograms/histograms.xml",
       "$root_out_dir/pyproto/google/",
-      "$root_out_dir/resources.pak",
       "$root_out_dir/ui_test.pak",
     ]
     if (is_linux || is_win) {
@@ -358,6 +359,9 @@ if (!is_android) {
     if (is_linux) {
       data += [ "$root_out_dir/libppapi_tests.so" ]
     }
+    if (!is_mac) {
+      data_deps += [ "//chrome:packed_extra_resources" ]
+    }
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     ldflags = []
@@ -401,7 +405,7 @@ if (!is_android) {
     deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
 
     # Runtime dependencies
-    data_deps = [
+    data_deps += [
       "//ppapi:ppapi_tests",
       "//third_party/mesa:osmesa",
     ]
@@ -873,7 +877,6 @@ if (!is_android) {
       "$root_out_dir/chrome_material_200_percent.pak",
       "$root_out_dir/locales/",
       "$root_out_dir/remoting/unittests/",
-      "$root_out_dir/resources.pak",
       "$root_out_dir/resources/extension/",
       "$root_out_dir/test_case.html",
       "$root_out_dir/test_case.html.mock-http-headers",
@@ -965,6 +968,10 @@ if (!is_android) {
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
+    if (!is_mac) {
+      data_deps += [ "//chrome:packed_extra_resources" ]
+    }
+
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     # TODO(GYP) if (is_win) {
@@ -1393,7 +1400,6 @@ if (!is_android) {
       "//third_party/pywebsocket/",
       "//third_party/tlslite/",
       "$root_out_dir/pyproto/",
-      "$root_out_dir/resources.pak",
     ]
 
     if (is_linux || is_win) {
@@ -1436,6 +1442,10 @@ if (!is_android) {
       "//third_party/mesa:osmesa",
     ]
 
+    if (!is_mac) {
+      data_deps += [ "//chrome:packed_extra_resources" ]
+    }
+
     if (is_mac) {
       # Dictionary sync is disabled on Mac.
       sources -= [
@@ -1601,7 +1611,6 @@ test("unit_tests") {
     "//third_party/zlib/google/test/data/",
     "//tools/metrics/histograms/histograms.xml",
     "$root_out_dir/pyproto/google/",
-    "$root_out_dir/resources.pak",
   ]
   if (is_android || is_linux || is_win) {
     data += [
@@ -1701,6 +1710,13 @@ test("unit_tests") {
     ]
   }
 
+  if (is_mac) {
+    data_deps += [ "//chrome:chrome_framework" ]
+    data += [ "$root_out_dir/Chromium Framework.framework/" ]
+  } else {
+    data_deps += [ "//chrome:packed_extra_resources" ]
+  }
+
   if (is_android) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_sources,

diff --git a/components/BUILD.gn b/components/BUILD.gn
@@ -15,7 +15,7 @@ if (is_ios) {
   import("//ios/build/config.gni")
 }
 
-if (is_ios || is_mac) {
+if (is_ios) {
   bundle_data("components_tests_pak_bundle_data") {
     public_deps = [
       ":components_tests_pak",
@@ -210,10 +210,14 @@ test("components_unittests") {
     ]
   }  # iOS/!iOS
 
-  if (is_ios || is_mac) {
+  if (is_ios) {
     deps += [ ":components_tests_pak_bundle_data" ]
   }
 
+  if (is_mac) {
+    data_deps += [ "//content/shell:pak" ]
+  }
+
   if (is_android) {
     deps += [
       "//components/gcm_driver/instance_id:test_support",
@@ -421,6 +425,7 @@ if (!is_ios) {
     ]
 
     if (is_mac) {
+      data_deps += [ "//content/shell:content_shell" ]
       data += [ "$root_out_dir/Content Shell.app/" ]
     }
 

diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
@@ -266,6 +266,9 @@ source_set("unit_tests") {
     "psl_matching_helper_unittest.cc",
     "statistics_table_unittest.cc",
   ]
+  if (is_mac) {
+    sources -= [ "password_store_default_unittest.cc" ]
+  }
   deps = [
     ":test_support",
     ":unit_tests_bundle_data",

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -10,6 +10,18 @@
         },
         "test": "base_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -33,6 +45,12 @@
           "can_use_on_swarming_builders": true
         },
         "test": "ui_base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "unit_tests"
       }
     ]
   },
@@ -79,6 +97,18 @@
         },
         "test": "content_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -96,6 +126,12 @@
           "can_use_on_swarming_builders": true
         },
         "test": "ui_base_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "unit_tests"
       }
     ]
   },