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

Unified Diff: mojo/tools/data/apptests

Issue 1305893006: view-manager: Fix some issues regarding running tests in x11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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 | « components/view_manager/view_manager_app.cc ('k') | ui/platform_window/x11/x11_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/data/apptests
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index 358b8ac5716aad0eb6363e444774e7a6800a43e5..abbde4fc55fd18de2de5389f3b54e63a4b7a639e 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -41,7 +41,8 @@ tests = [
#},
{
'test': 'mojo:view_manager_apptests',
- 'args': ['--use-test-config']
+ 'args': ['--use-x11-test-config',
+ '--override-use-gl-with-osmesa-for-tests']
},
]
@@ -57,6 +58,7 @@ if config.target_os != config.OS_ANDROID:
'name': 'mojo:html_viewer_apptests',
'type': 'gtest_isolated',
'args': ['--enable-html-viewer-test-interface',
+ '--use-x11-test-config',
'--override-use-gl-with-osmesa-for-tests']
},
{
@@ -65,6 +67,7 @@ if config.target_os != config.OS_ANDROID:
'type': 'gtest_isolated',
'args': ['--oopif-always-create-new-frame-tree',
'--enable-html-viewer-test-interface',
+ '--use-x11-test-config',
'--override-use-gl-with-osmesa-for-tests']
},
# TODO(ben): These tests are disabled pending mandoline:browser refactoring.
« no previous file with comments | « components/view_manager/view_manager_app.cc ('k') | ui/platform_window/x11/x11_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698