diff options
| -rw-r--r-- | build/gn_migration.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 13 | ||||
| -rw-r--r-- | chrome/setup_unittests.isolate | 22 | ||||
| -rw-r--r-- | testing/buildbot/chromium.fyi.json | 96 | ||||
| -rw-r--r-- | testing/buildbot/ninja_to_gn.pyl | 1 |
5 files changed, 133 insertions, 0 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 422ac29..83c157f 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -569,6 +569,7 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:installer_util_unittests_run', + '../chrome/chrome.gyp:setup_unittests_run', '../sandbox/sandbox.gyp:sbox_integration_tests', '../sandbox/sandbox.gyp:sbox_unittests', '../sandbox/sandbox.gyp:sbox_validation_tests', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index d5d071e..f1b15cc 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -1088,6 +1088,19 @@ 'installer_util_unittests.isolate', ], }, + { + 'target_name': 'setup_unittests_run', + 'type': 'none', + 'dependencies': [ + 'setup_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'setup_unittests.isolate', + ], + }, ], }], ], diff --git a/chrome/setup_unittests.isolate b/chrome/setup_unittests.isolate new file mode 100644 index 0000000..5b10de8 --- /dev/null +++ b/chrome/setup_unittests.isolate @@ -0,0 +1,22 @@ +# 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=="win"', { + 'variables': { + 'command': [ + '<(PRODUCT_DIR)/setup_unittests.exe', + ], + 'files': [ + '<(PRODUCT_DIR)/setup_unittests.exe', + 'installer/test/data/', + 'test/data/installer/', + ], + }, + }], + ], + 'includes': [ + '../base/base.isolate', + ], +} diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 2f7ac0c..8173fc1 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -294,6 +294,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1101,6 +1107,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1232,6 +1244,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1363,6 +1381,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1494,6 +1518,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1625,6 +1655,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1768,6 +1804,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -1940,6 +1982,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2112,6 +2160,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2255,6 +2309,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2386,6 +2446,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2517,6 +2583,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2648,6 +2720,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2757,6 +2835,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -2885,6 +2969,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { @@ -3016,6 +3106,12 @@ "test": "sbox_validation_tests" }, { + "swarming": { + "can_use_on_swarming_builders": true + }, + "test": "setup_unittests" + }, + { "test": "skia_unittests" }, { diff --git a/testing/buildbot/ninja_to_gn.pyl b/testing/buildbot/ninja_to_gn.pyl index 413f045..5e26949 100644 --- a/testing/buildbot/ninja_to_gn.pyl +++ b/testing/buildbot/ninja_to_gn.pyl @@ -84,6 +84,7 @@ "sbox_integration_tests": "//sandbox/win:sbox_integration_tests", "sbox_unittests": "//sandbox/win:sbox_unittests", "sbox_validation_tests": "//sandbox/win:sbox_validation_tests", + "setup_unittests": "//chrome/installer/setup:setup_unittests", "skia_unittests": "//skia:skia_unittests", "sql_unittests": "//sql:sql_unittests", "sync_integration_tests": "//sync:sync_integration_tests", |