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

Unified Diff: ui/touch_selection/ui_touch_selection_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: 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
Index: ui/touch_selection/ui_touch_selection_unittests.isolate
diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate
index 68e1e01504424d757f7b5c9c3c0798275317c67a..1a962dd0924559040153cae9b4eaec5d7efe1e9c 100644
--- a/ui/touch_selection/ui_touch_selection_unittests.isolate
+++ b/ui/touch_selection/ui_touch_selection_unittests.isolate
@@ -11,7 +11,7 @@
],
},
}],
- ['OS=="linux"', {
+ ['OS=="linux" and use_x11==1', {
'variables': {
'command': [
'../../testing/xvfb.py',
@@ -24,14 +24,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',
],
},
}],
@@ -49,7 +49,7 @@
],
},
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="mac" or OS=="win" or use_ozone==1', {
'variables': {
'command': [
'../../testing/test_env.py',
« ash/ash_unittests.isolate ('K') | « ui/message_center/message_center_unittests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698