From 29452e9a35bbeb5ad8014c9262b4056553a9b3d3 Mon Sep 17 00:00:00 2001 From: maruel Date: Tue, 30 Jun 2015 15:51:20 -0700 Subject: [PATCH] Convert wm_unittests to run exclusively on Swarming 0 configs already ran on Swarming 18 used to run locally and were converted: - chromium.chromiumos.json: Linux ChromiumOS Ozone Tests (1) - chromium.chromiumos.json: Linux ChromiumOS Tests (1) - chromium.chromiumos.json: Linux ChromiumOS Tests (dbg)(1) - chromium.fyi.json: Linux Trusty - chromium.fyi.json: Linux Trusty (dbg) - chromium.linux.json: Linux Tests - chromium.linux.json: Linux Tests (dbg)(1) - chromium.linux.json: Linux Tests (dbg)(1)(32) - chromium.memory.fyi.json: Linux ChromeOS MSan Tests - chromium.memory.fyi.json: Linux MSan Tests - chromium.memory.fyi.json: Linux TSan Tests - chromium.webkit.json: Linux ChromiumOS Tests (1) - chromium.webkit.json: Linux ChromiumOS Tests (dbg)(1) - chromium.win.json: Vista Tests (1) - chromium.win.json: Win 7 Tests x64 (1) - chromium.win.json: Win7 Tests (1) - chromium.win.json: Win7 Tests (dbg)(1) - chromium.win.json: XP Tests (1) Ran: ./manage.py --convert wm_unittests R=sky@chromium.org,thakis@chromium.org TBR= BUG=98637 Review URL: https://codereview.chromium.org/1217473009 Cr-Commit-Position: refs/heads/master@{#336901} --- build/gn_migration.gypi | 1 + testing/buildbot/chromium.chromiumos.json | 9 ++++ testing/buildbot/chromium.fyi.json | 6 +++ testing/buildbot/chromium.linux.json | 9 ++++ testing/buildbot/chromium.memory.fyi.json | 9 ++++ testing/buildbot/chromium.webkit.json | 6 +++ testing/buildbot/chromium.win.json | 15 +++++++ ui/wm/wm.gyp | 19 +++++++++ ui/wm/wm_unittests.isolate | 71 +++++++++++++++++++++++++++++++ 9 files changed, 145 insertions(+) create mode 100644 ui/wm/wm_unittests.isolate diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 9c5ca914bd8c..242936a7a18d 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -552,6 +552,7 @@ ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:aura_unittests_run', + '../ui/wm/wm.gyp:wm_unittests_run', ], }], ['enable_webrtc==1 or OS!="android"', { diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 61b2e2c489c0..c7090bfbe748 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -349,6 +349,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] @@ -591,6 +594,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] @@ -832,6 +838,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index e21b4240efb1..e38f80eca778 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -3084,6 +3084,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -3516,6 +3519,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 2c52731fff7f..9e3719a09fb1 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -727,6 +727,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -1020,6 +1023,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -1297,6 +1303,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 6ed802ca5898..2f965d3e784e 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -235,6 +235,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] @@ -486,6 +489,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] @@ -699,6 +705,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index c42e6a6f20f3..fffd225a15b0 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -225,6 +225,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] @@ -457,6 +460,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ] diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 1ba872771824..de3039bebc73 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -253,6 +253,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -542,6 +545,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -950,6 +956,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -1219,6 +1228,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], @@ -1645,6 +1657,9 @@ "test": "views_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "wm_unittests" } ], diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp index e7415a8c5864..08a9dedcc7e4 100644 --- a/ui/wm/wm.gyp +++ b/ui/wm/wm.gyp @@ -157,4 +157,23 @@ ], }, ], + 'conditions': [ + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'wm_unittests_run', + 'type': 'none', + 'dependencies': [ + 'wm_unittests', + ], + 'includes': [ + '../../build/isolate.gypi', + ], + 'sources': [ + 'wm_unittests.isolate', + ], + }, + ], + }], + ], } diff --git a/ui/wm/wm_unittests.isolate b/ui/wm/wm_unittests.isolate new file mode 100644 index 000000000000..624b76087b26 --- /dev/null +++ b/ui/wm/wm_unittests.isolate @@ -0,0 +1,71 @@ +# Copyright 2015 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. +{ + 'conditions': [ + ['use_x11==0', { + 'variables': { + 'command': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['use_x11==1', { + 'variables': { + 'command': [ + '../../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../../testing/test_env.py', + '<(PRODUCT_DIR)/ui_test.pak', + '<(PRODUCT_DIR)/wm_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/libosmesa.so', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/osmesa.so', + ], + }, + }], + ['OS=="win"', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/osmesa.dll', + ], + }, + }], + ], + 'includes': [ + '../../base/base.isolate', + ], +} -- 2.11.4.GIT