[fuchsia] Enable base_util_unittests on waterfall & CQ.

New //base primitives are being added under //base/util, which has its own unit-tests suite, so we should be running that. Bug: 1020698 Change-Id: I5126381cf2fc1fdf3a5b6e466cd994d23167f926 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2062420 Commit-Queue: Wez <wez@chromium.org> Auto-Submit: Wez <wez@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#743066}
Denger-Network · Feb 20, 2020 · f66f79a · f66f79a
1 parent 2fef0e9
commit f66f79a
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 2 deletions.
diff --git a/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc b/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc
@@ -14,7 +14,9 @@
 namespace util {
 
 TEST(MultiSourceMemoryPressureMonitorTest, RunDispatchCallback) {
-  base::test::TaskEnvironment task_environment;
+  base::test::SingleThreadTaskEnvironment task_environment(
+      base::test::TaskEnvironment::MainThreadType::IO);
+
   MultiSourceMemoryPressureMonitor monitor;
   monitor.Start();
   auto* aggregator = monitor.aggregator_for_testing();
@@ -35,8 +37,10 @@ TEST(MultiSourceMemoryPressureMonitorTest, RunDispatchCallback) {
 }
 
 TEST(MultiSourceMemoryPressureMonitorTest, Histograms) {
-  base::test::TaskEnvironment task_environment(
+  base::test::SingleThreadTaskEnvironment task_environment(
+      base::test::TaskEnvironment::MainThreadType::IO,
       base::test::TaskEnvironment::TimeSource::MOCK_TIME);
+
   MultiSourceMemoryPressureMonitor monitor;
   base::HistogramTester histogram_tester;
   monitor.Start();

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -11733,6 +11733,24 @@
         "test": "base_unittests",
         "test_target": "//base:base_unittests"
       },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "arm64",
+              "inside_docker": "1",
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "base_util_unittests",
+        "test_target": "//base/util:base_util_unittests"
+      },
       {
         "merge": {
           "args": [],
@@ -12350,6 +12368,23 @@
         "test": "base_unittests",
         "test_target": "//base:base_unittests"
       },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "base_util_unittests",
+        "test_target": "//base/util:base_util_unittests"
+      },
       {
         "merge": {
           "args": [],
@@ -12936,6 +12971,23 @@
         "test": "base_unittests",
         "test_target": "//base:base_unittests"
       },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "base_util_unittests",
+        "test_target": "//base/util:base_util_unittests"
+      },
       {
         "merge": {
           "args": [],

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -1734,6 +1734,26 @@
         "test": "base_unittests",
         "test_target": "//base:base_unittests"
       },
+      {
+        "args": [
+          "--device=aemu"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "base_util_unittests",
+        "test_target": "//base/util:base_util_unittests"
+      },
       {
         "args": [
           "--device=aemu"

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -1228,6 +1228,7 @@
     'fuchsia_gtests': {
       'angle_unittests': {},
       'base_unittests': {},
+      'base_util_unittests': {},
       'blink_common_unittests': {},
       'blink_heap_unittests': {},
       'blink_platform_unittests': {},