Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: build/gn_migration.gypi

Issue 1218203002: Convert sandbox_mac_unittests to run exclusively on Swarming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sandbox/mac/sandbox_mac.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 58bc6c7256329372fcaaf4a2ffe4d10bb14aea2c..c99a753ee7780312d34e2a21374f1536dd440a24 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -543,6 +543,7 @@
'../sql/sql.gyp:sql_unittests_run',
'../sync/sync.gyp:sync_unit_tests_run',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
+ '../tools/gn/gn.gyp:gn_unittests_run',
'../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
'../ui/app_list/app_list.gyp:app_list_unittests_run',
'../ui/events/events.gyp:events_unittests_run',
@@ -551,6 +552,21 @@
'../url/url.gyp:url_unittests_run',
],
'conditions': [
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ '../sandbox/sandbox.gyp:sandbox_mac_unittests_run',
+ ],
+ }],
+ ['use_ash==1', {
+ 'dependencies': [
+ '../ash/ash.gyp:ash_unittests_run',
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:aura_unittests_run',
@@ -564,16 +580,6 @@
}],
],
}],
- ['test_isolation_mode!="noop" and use_ash==1', {
- 'dependencies': [
- '../ash/ash.gyp:ash_unittests_run',
- ],
- }],
- ['test_isolation_mode!="noop" and OS=="linux"', {
- 'dependencies': [
- '../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
- ],
- }],
['use_openssl==1', {
'dependencies': [
# TODO(GYP): All of these targets still need to be converted.
« no previous file with comments | « no previous file | sandbox/mac/sandbox_mac.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698