diff options
| -rw-r--r-- | extensions/extensions_tests.gyp | 13 | ||||
| -rw-r--r-- | extensions/extensions_unittests.isolate | 74 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 15 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.fyi.json | 9 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.json | 3 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 15 |
9 files changed, 153 insertions, 0 deletions
diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 80f8688..8703f29 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -126,6 +126,19 @@ 'extensions_browsertests.isolate', ], }, + { + 'target_name': 'extensions_unittests_run', + 'type': 'none', + 'dependencies': [ + 'extensions_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'extensions_unittests.isolate', + ], + } ], }], ], diff --git a/extensions/extensions_unittests.isolate b/extensions/extensions_unittests.isolate new file mode 100644 index 0000000..b17b435 --- /dev/null +++ b/extensions/extensions_unittests.isolate @@ -0,0 +1,74 @@ +# 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)/extensions_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)/extensions_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': [ + '../chrome/test/data/extensions/', + '../testing/test_env.py', + '<(PRODUCT_DIR)/extensions_unittests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/extensions_shell_and_test.pak', + 'test/data/', + ], + }, + }], + ['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', + '../gin/v8.isolate', + ], +} diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 017479d6..74846c1 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -216,6 +216,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -477,6 +480,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -732,6 +738,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index a4f5fdc..f4874b6 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -583,6 +583,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -884,6 +887,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1177,6 +1183,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 1a1dcae..d3d944c 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -123,6 +123,9 @@ "test": "crypto_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -325,6 +328,9 @@ "test": "crypto_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -560,6 +566,9 @@ "test": "crypto_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -795,6 +804,9 @@ "test": "crypto_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1030,6 +1042,9 @@ "test": "crypto_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 908ff7b..91f79ab 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -105,6 +105,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -357,6 +360,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -604,6 +610,9 @@ "test": "events_unittests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index fbe4dcc..7e9bf1a 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -78,6 +78,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index a8315c3..3bb3a15 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -108,6 +108,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -354,6 +357,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 09eb41a..8ab8c83 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -99,6 +99,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -391,6 +394,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -811,6 +817,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1109,6 +1118,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { @@ -1548,6 +1560,9 @@ "test": "extensions_browsertests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, "test": "extensions_unittests" }, { |