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

Unified Diff: ui/app_list/app_list_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/app_list/app_list_unittests.isolate
diff --git a/ui/app_list/app_list_unittests.isolate b/ui/app_list/app_list_unittests.isolate
index 4ceb64ddba4915b5812df66618d54d161f3ddad1..d45159be2abfa706f844bb838d9b857b154301f8 100644
--- a/ui/app_list/app_list_unittests.isolate
+++ b/ui/app_list/app_list_unittests.isolate
@@ -12,7 +12,7 @@
],
},
}],
- ['OS=="linux"', {
+ ['OS=="linux" and use_x11==1', {
'variables': {
'command': [
'../../testing/xvfb.py',
@@ -25,14 +25,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,7 +50,7 @@
],
},
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="mac" or OS=="win" or use_ozone==1', {
'variables': {
'command': [
'../../testing/test_env.py',

Powered by Google App Engine
This is Rietveld 408576698