diff options
| -rw-r--r-- | crypto/crypto.gyp | 17 | ||||
| -rw-r--r-- | crypto/crypto_unittests.isolate | 72 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 21 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 63 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 21 | ||||
| -rw-r--r-- | testing/buildbot/chromium.mac.json | 28 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.json | 28 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 14 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 35 | ||||
| -rw-r--r-- | testing/buildbot/chromium_memory_trybot.json | 7 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 7 |
11 files changed, 281 insertions, 32 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 6d60f48..632c498 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -297,5 +297,22 @@ 'sources': [], } ]}], + ['test_isolation_mode != "noop"', { + 'targets': [ + { + 'target_name': 'crypto_unittests_run', + 'type': 'none', + 'dependencies': [ + 'crypto_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'crypto_unittests.isolate', + ], + }, + ], + }], ], } diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate new file mode 100644 index 0000000..381a1c8 --- /dev/null +++ b/crypto/crypto_unittests.isolate @@ -0,0 +1,72 @@ +# 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': [ + ['OS=="linux"', { + 'variables': { + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + 'files': [ + '../testing/xvfb.py', + ], + }, + }], + ['OS=="linux" and use_ozone==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + ], + 'read_only': 1, + }, + }], + ['OS=="mac" or OS=="win"', { + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)', + '--brave-new-test-launcher', + '--test-launcher-bot-mode', + '--asan=<(asan)', + '--lsan=<(lsan)', + '--msan=<(msan)', + '--tsan=<(tsan)', + ], + }, + }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/crypto_unittests.dSYM/', + ], + }, + }], + ['OS=="win" and (fastbuild==0 or fastbuild==1)', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/crypto_unittests.exe.pdb', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 8f106b7..64f2cd5 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -30,7 +30,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "display_unittests", "extensions_unittests", @@ -117,7 +122,12 @@ } }, "content_unittests", - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "device_unittests", "display_unittests", @@ -187,7 +197,12 @@ "cacheinvalidation_unittests", "chromeos_unittests", "components_unittests", - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "extensions_unittests", "google_apis_unittests", diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index e20998b..a03e575 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -372,7 +372,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -444,7 +449,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -516,7 +526,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -588,7 +603,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -660,7 +680,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -732,7 +757,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -804,7 +834,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -855,7 +890,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -906,7 +946,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 15fa1a6..a5193ff 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -62,7 +62,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "device_unittests", "display_unittests", @@ -240,7 +245,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "device_unittests", "display_unittests", @@ -398,7 +408,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "device_unittests", "display_unittests", diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 55e5481..d7f39bb 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -59,7 +59,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", { @@ -204,7 +209,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", { @@ -349,7 +359,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", { @@ -494,7 +509,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "extensions_unittests", "gcm_unit_tests", { diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index f1e3c95..87a67e4 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -32,7 +32,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "device_unittests", "display_unittests", "extensions_unittests", @@ -128,7 +133,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "gcm_unit_tests", "gpu_unittests", { @@ -188,7 +198,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "gcm_unit_tests", "gpu_unittests", { @@ -264,7 +279,12 @@ } }, "components_unittests", - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "device_unittests", "display_unittests", "events_unittests", diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 17cc5e9..ae8f0b4 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -30,7 +30,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "display_unittests", "extensions_unittests", @@ -110,7 +115,12 @@ "cacheinvalidation_unittests", "chromeos_unittests", "components_unittests", - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "dbus_unittests", "extensions_unittests", "google_apis_unittests", diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index c462aaf..c90ec05 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -58,7 +58,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "events_unittests", { "test": "extensions_browsertests", @@ -194,7 +199,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, { "test": "extensions_browsertests", "swarming": { @@ -341,7 +351,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "device_unittests", "events_unittests", { @@ -495,7 +510,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "device_unittests", "events_unittests", { @@ -647,7 +667,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "events_unittests", { "test": "extensions_browsertests", diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json index c8f0388..c794785 100644 --- a/testing/buildbot/chromium_memory_trybot.json +++ b/testing/buildbot/chromium_memory_trybot.json @@ -45,7 +45,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, "device_unittests", { "test": "display_unittests", diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index c2d7e72..3b3905b 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -104,7 +104,12 @@ "can_use_on_swarming_builders": true } }, - "crypto_unittests", + { + "test": "crypto_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } + }, { "test": "dbus_unittests", "platforms": ["linux"] |