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

Unified Diff: mojo/tools/data/apptests

Issue 1122373003: Exclude apptests that fail or crash on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | no next file » | 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 981d9e3aacc4e1356acbddbe5884162d80c7caf6..54a26adbc3c8b9340c759678edb4f59afb9beca7 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -29,25 +29,30 @@ tests = [
"test": "mojo:clipboard_apptests",
},
{
- "test": "mojo:html_viewer_apptests",
- "shell-args": ["--is-headless"],
- },
- {
"test": "mojo:network_service_apptests",
},
# TODO(msw|jam): Fix and enable the shell_apptests: http://crbug.com/479316
#{
# "test": "mojo:shell_apptests",
#},
- {
- "test": "mojo:view_manager_apptests",
- "type": "gtest_isolated",
- "shell-args": [
- "--use-headless-config",
- "--url-mappings=mojo:window_manager=mojo:test_window_manager"
- ]
- },
- {
- "test": "mojo:resource_provider_apptests",
- },
]
+
+# TODO(msw): Get these tests passing on Android too. http://crbug.com/486220
+if config.target_os != config.OS_ANDROID:
+ tests += [
+ {
+ "test": "mojo:html_viewer_apptests",
+ "shell-args": ["--is-headless"],
+ },
+ {
+ "test": "mojo:view_manager_apptests",
+ "type": "gtest_isolated",
+ "shell-args": [
+ "--use-headless-config",
+ "--url-mappings=mojo:window_manager=mojo:test_window_manager"
+ ]
+ },
+ {
+ "test": "mojo:resource_provider_apptests",
+ },
+ ]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698