Commit c72391a1 authored by maruel's avatar maruel Committed by Commit bot

Partially reapply "Isolate remaining tests under ui/"

The initial commit was in 42f9c67b. The difference is:
- Left out testing/buildbot/chromium.win.json since it caused
  http://crbug.com/441690 and more investigation is needed.

TBR=jochen@chromium.org
R=jam@chromium.org
BUG=98637

Review URL: https://codereview.chromium.org/797483004

Cr-Commit-Position: refs/heads/master@{#308167}
parent 4ff12a73
{ {
"Linux Tests": { "Linux Tests": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"app_shell_browsertests", "app_shell_browsertests",
"app_shell_unittests", "app_shell_unittests",
"aura_unittests", "aura_unittests",
...@@ -41,10 +51,20 @@ ...@@ -41,10 +51,20 @@
"dbus_unittests", "dbus_unittests",
"device_unittests", "device_unittests",
"display_unittests", "display_unittests",
"events_unittests", {
"test": "events_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"google_apis_unittests", "google_apis_unittests",
"gpu_unittests", "gpu_unittests",
{ {
...@@ -75,7 +95,12 @@ ...@@ -75,7 +95,12 @@
"remoting_unittests", "remoting_unittests",
"sandbox_linux_unittests", "sandbox_linux_unittests",
"sql_unittests", "sql_unittests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"ui_touch_selection_unittests", "ui_touch_selection_unittests",
{ {
"test": "sync_integration_tests", "test": "sync_integration_tests",
...@@ -111,8 +136,18 @@ ...@@ -111,8 +136,18 @@
}, },
"Linux Tests (dbg)(1)(32)": { "Linux Tests (dbg)(1)(32)": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"app_shell_browsertests", "app_shell_browsertests",
"app_shell_unittests", "app_shell_unittests",
"aura_unittests", "aura_unittests",
...@@ -151,10 +186,20 @@ ...@@ -151,10 +186,20 @@
"dbus_unittests", "dbus_unittests",
"device_unittests", "device_unittests",
"display_unittests", "display_unittests",
"events_unittests", {
"test": "events_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"google_apis_unittests", "google_apis_unittests",
"gpu_unittests", "gpu_unittests",
{ {
...@@ -185,7 +230,12 @@ ...@@ -185,7 +230,12 @@
"remoting_unittests", "remoting_unittests",
"sandbox_linux_unittests", "sandbox_linux_unittests",
"sql_unittests", "sql_unittests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"ui_touch_selection_unittests", "ui_touch_selection_unittests",
{ {
"test": "sync_integration_tests", "test": "sync_integration_tests",
...@@ -213,8 +263,18 @@ ...@@ -213,8 +263,18 @@
}, },
"Linux Tests (dbg)(1)": { "Linux Tests (dbg)(1)": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"app_shell_browsertests", "app_shell_browsertests",
"app_shell_unittests", "app_shell_unittests",
"aura_unittests", "aura_unittests",
...@@ -253,10 +313,20 @@ ...@@ -253,10 +313,20 @@
"dbus_unittests", "dbus_unittests",
"device_unittests", "device_unittests",
"display_unittests", "display_unittests",
"events_unittests", {
"test": "events_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"google_apis_unittests", "google_apis_unittests",
"gpu_unittests", "gpu_unittests",
{ {
...@@ -291,7 +361,12 @@ ...@@ -291,7 +361,12 @@
"args": ["--test-launcher-print-test-stdio=always"] "args": ["--test-launcher-print-test-stdio=always"]
}, },
"sql_unittests", "sql_unittests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"ui_touch_selection_unittests", "ui_touch_selection_unittests",
{ {
"test": "sync_integration_tests", "test": "sync_integration_tests",
......
{ {
"Mac10.6 Tests": { "Mac10.6 Tests": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "base_unittests", "test": "base_unittests",
"swarming": { "swarming": {
...@@ -36,7 +46,12 @@ ...@@ -36,7 +46,12 @@
"crypto_unittests", "crypto_unittests",
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"gpu_unittests", "gpu_unittests",
"google_apis_unittests", "google_apis_unittests",
{ {
...@@ -48,7 +63,12 @@ ...@@ -48,7 +63,12 @@
"ipc_tests", "ipc_tests",
"jingle_unittests", "jingle_unittests",
"media_unittests", "media_unittests",
"message_center_unittests", {
"test": "message_center_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"mojo_common_unittests", "mojo_common_unittests",
"mojo_public_bindings_unittests", "mojo_public_bindings_unittests",
"mojo_public_environment_unittests", "mojo_public_environment_unittests",
...@@ -73,7 +93,12 @@ ...@@ -73,7 +93,12 @@
} }
}, },
"sync_unit_tests", "sync_unit_tests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "unit_tests", "test": "unit_tests",
"swarming": { "swarming": {
...@@ -99,8 +124,18 @@ ...@@ -99,8 +124,18 @@
}, },
"Mac10.8 Tests": { "Mac10.8 Tests": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "base_unittests", "test": "base_unittests",
"swarming": { "swarming": {
...@@ -134,7 +169,12 @@ ...@@ -134,7 +169,12 @@
"crypto_unittests", "crypto_unittests",
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"gpu_unittests", "gpu_unittests",
"google_apis_unittests", "google_apis_unittests",
{ {
...@@ -146,7 +186,12 @@ ...@@ -146,7 +186,12 @@
"ipc_tests", "ipc_tests",
"jingle_unittests", "jingle_unittests",
"media_unittests", "media_unittests",
"message_center_unittests", {
"test": "message_center_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"mojo_common_unittests", "mojo_common_unittests",
"mojo_public_bindings_unittests", "mojo_public_bindings_unittests",
"mojo_public_environment_unittests", "mojo_public_environment_unittests",
...@@ -171,7 +216,12 @@ ...@@ -171,7 +216,12 @@
} }
}, },
"sync_unit_tests", "sync_unit_tests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "unit_tests", "test": "unit_tests",
"swarming": { "swarming": {
...@@ -197,8 +247,18 @@ ...@@ -197,8 +247,18 @@
}, },
"Mac10.9 Tests": { "Mac10.9 Tests": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "base_unittests", "test": "base_unittests",
"swarming": { "swarming": {
...@@ -232,7 +292,12 @@ ...@@ -232,7 +292,12 @@
"crypto_unittests", "crypto_unittests",
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"gpu_unittests", "gpu_unittests",
"google_apis_unittests", "google_apis_unittests",
{ {
...@@ -244,7 +309,12 @@ ...@@ -244,7 +309,12 @@
"ipc_tests", "ipc_tests",
"jingle_unittests", "jingle_unittests",
"media_unittests", "media_unittests",
"message_center_unittests", {
"test": "message_center_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"mojo_common_unittests", "mojo_common_unittests",
"mojo_public_bindings_unittests", "mojo_public_bindings_unittests",
"mojo_public_environment_unittests", "mojo_public_environment_unittests",
...@@ -269,7 +339,12 @@ ...@@ -269,7 +339,12 @@
} }
}, },
"sync_unit_tests", "sync_unit_tests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "unit_tests", "test": "unit_tests",
"swarming": { "swarming": {
...@@ -295,8 +370,18 @@ ...@@ -295,8 +370,18 @@
}, },
"Mac10.9 Tests (dbg)": { "Mac10.9 Tests (dbg)": {
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"app_list_unittests", "test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "base_unittests", "test": "base_unittests",
"swarming": { "swarming": {
...@@ -330,7 +415,12 @@ ...@@ -330,7 +415,12 @@
"crypto_unittests", "crypto_unittests",
"extensions_unittests", "extensions_unittests",
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"gpu_unittests", "gpu_unittests",
"google_apis_unittests", "google_apis_unittests",
{ {
...@@ -343,7 +433,12 @@ ...@@ -343,7 +433,12 @@
"ipc_tests", "ipc_tests",
"jingle_unittests", "jingle_unittests",
"media_unittests", "media_unittests",
"message_center_unittests", {
"test": "message_center_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"mojo_common_unittests", "mojo_common_unittests",
"mojo_public_bindings_unittests", "mojo_public_bindings_unittests",
"mojo_public_environment_unittests", "mojo_public_environment_unittests",
...@@ -368,7 +463,12 @@ ...@@ -368,7 +463,12 @@
} }
}, },
"sync_unit_tests", "sync_unit_tests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "unit_tests", "test": "unit_tests",
"swarming": { "swarming": {
......
...@@ -3,12 +3,22 @@ ...@@ -3,12 +3,22 @@
"all" "all"
], ],
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", {
"test": "accessibility_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "app_installer_unittests", "test": "app_installer_unittests",
"platforms": ["win"] "platforms": ["win"]
}, },
"app_list_unittests", {
"test": "app_list_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "ash_unittests", "test": "ash_unittests",
"chromium_configs": [ "chromium_configs": [
...@@ -84,13 +94,23 @@ ...@@ -84,13 +94,23 @@
"platforms": ["linux"] "platforms": ["linux"]
}, },
"device_unittests", "device_unittests",
"events_unittests", {
"test": "events_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "extensions_unittests", "test": "extensions_unittests",
"platforms": ["win", "mac", "linux"] "platforms": ["win", "mac", "linux"]
}, },
"gcm_unit_tests", "gcm_unit_tests",
"gfx_unittests", {
"test": "gfx_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"google_apis_unittests", "google_apis_unittests",
"gpu_unittests", "gpu_unittests",
{ {
...@@ -116,7 +136,12 @@ ...@@ -116,7 +136,12 @@
}, },
"media_perftests", "media_perftests",
"media_unittests", "media_unittests",
"message_center_unittests", {
"test": "message_center_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"mojo_common_unittests", "mojo_common_unittests",
"mojo_public_bindings_unittests", "mojo_public_bindings_unittests",
"mojo_public_environment_unittests", "mojo_public_environment_unittests",
...@@ -157,7 +182,12 @@ ...@@ -157,7 +182,12 @@
} }
}, },
"sync_unit_tests", "sync_unit_tests",
"ui_base_unittests", {
"test": "ui_base_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"ui_touch_selection_unittests", "ui_touch_selection_unittests",
{ {
"test": "unit_tests", "test": "unit_tests",
......
...@@ -112,4 +112,30 @@ ...@@ -112,4 +112,30 @@
}, },
}, },
], ],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'accessibility_unittests_run',
'type': 'none',
'dependencies': [
'accessibility_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'accessibility_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'<(PRODUCT_DIR)/accessibility_unittests<(EXECUTABLE_SUFFIX)',
],
'files': [
'<(PRODUCT_DIR)/accessibility_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
...@@ -371,5 +371,29 @@ ...@@ -371,5 +371,29 @@
}, },
], ],
}], # toolkit_views==1 }], # toolkit_views==1
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'app_list_unittests_run',
'type': 'none',
'dependencies': [
'app_list_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'app_list_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
], ],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/ui_test.pak',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.so',
],
},
}],
['OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/app_list_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
...@@ -273,5 +273,29 @@ ...@@ -273,5 +273,29 @@
}, },
], ],
}], }],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'ui_base_unittests_run',
'type': 'none',
'dependencies': [
'ui_base_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'ui_base_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
], ],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../../testing/test_env.py',
'test/data/data_pack_unittest/truncated-header.pak',
'<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/ui_test.pak',
],
},
}],
['OS=="linux" or OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ui/en-US.pak',
'<(PRODUCT_DIR)/ui/ui_resources_100_percent.pak',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ui_unittests Framework.framework/',
'<(PRODUCT_DIR)/osmesa.so',
],
},
}],
['OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/ui_base_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
...@@ -397,5 +397,29 @@ ...@@ -397,5 +397,29 @@
}, },
], ],
}], }],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'events_unittests_run',
'type': 'none',
'dependencies': [
'events_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'events_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
], ],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.so',
],
},
}],
['OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
...@@ -191,5 +191,29 @@ ...@@ -191,5 +191,29 @@
}, },
], ],
}], }],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'gfx_unittests_run',
'type': 'none',
'dependencies': [
'gfx_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'gfx_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
], ],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
],
'files': [
'test/data/',
'<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/ui_test.pak',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
...@@ -255,4 +255,30 @@ ...@@ -255,4 +255,30 @@
], ],
}, # target_name: message_center_unittests }, # target_name: message_center_unittests
], ],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'message_center_unittests_run',
'type': 'none',
'dependencies': [
'message_center_unittests',
],
'includes': [
'../../build/isolate.gypi',
],
'sources': [
'message_center_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
},
],
}],
],
} }
# Copyright (c) 2014 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" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/ui_test.pak',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.so',
],
},
}],
['OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/message_center_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
},
}],
],
'includes': [
'../../base/base.isolate',
],
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment