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

Unified Diff: ui/message_center/message_center_unittests.isolate

Issue 813363003: Use Xvfb in isolated testing only if use_x11 is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update isolator.py Created 5 years, 11 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 | « ui/events/events_unittests.isolate ('k') | ui/touch_selection/ui_touch_selection_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/message_center_unittests.isolate
diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate
index 7ad8cc3cf6d9b645cc367a17465e867d15ac5ef7..18ad7162837a71087ebc5e923a1e03ce863cc085 100644
--- a/ui/message_center/message_center_unittests.isolate
+++ b/ui/message_center/message_center_unittests.isolate
@@ -12,7 +12,19 @@
],
},
}],
- ['OS=="linux"', {
+ ['use_x11==0', {
+ '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)',
+ ],
+ },
+ }],
+ ['use_x11==1', {
'variables': {
'command': [
'../../testing/xvfb.py',
@@ -25,14 +37,14 @@
],
'files': [
'../../testing/xvfb.py',
- '<(PRODUCT_DIR)/libosmesa.so',
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
- ['OS=="linux" and use_ozone==0', {
+ ['OS=="linux"', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
@@ -50,18 +62,6 @@
],
},
}],
- ['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',
« no previous file with comments | « ui/events/events_unittests.isolate ('k') | ui/touch_selection/ui_touch_selection_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698