summaryrefslogtreecommitdiffstats
path: root/mojo/tools
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2015-06-08 16:08:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-08 23:08:41 +0000
commit43efa2c9d4b703125270a97c9afde446aed55180 (patch)
tree31914f48a29895462a95b8dbcad4af0f308f65f4 /mojo/tools
parent0786d7659f1707cd46c94d54dfbf5312dc7dd057 (diff)
downloadchromium_src-43efa2c9d4b703125270a97c9afde446aed55180.zip
chromium_src-43efa2c9d4b703125270a97c9afde446aed55180.tar.gz
chromium_src-43efa2c9d4b703125270a97c9afde446aed55180.tar.bz2
Run VM apptests on Android; disable fixtures failing or timing out.
View Manager apptests are run on Android bots and locally: http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android $ mojo/tools/apptest_runner.py mojo/tools/data/apptests out/android_Debug/ BUG=497920 TEST=Bots pass new tests (fingers crossed; more flakes inevitable). R=sky@chromium.org Review URL: https://codereview.chromium.org/1168133004 Cr-Commit-Position: refs/heads/master@{#333377}
Diffstat (limited to 'mojo/tools')
-rw-r--r--mojo/tools/data/apptests14
1 files changed, 7 insertions, 7 deletions
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index 382e859..04ea4d3 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -30,11 +30,16 @@ tests = [
"test": "mojo:network_service_apptests",
"type": "gtest_isolated",
},
- # TODO(msw|jam): Fix and enable the shell_apptests: http://crbug.com/479316
+ # TODO(msw|jam): Fix and enable the runner_apptests: http://crbug.com/479316
#{
- # "test": "mojo:shell_apptests",
+ # "test": "mojo:runner_apptests",
# "type": "gtest_isolated",
#},
+ {
+ "test": "mojo:view_manager_apptests",
+ "type": "gtest_isolated",
+ "args": ["--use-headless-config"]
+ },
]
# TODO(msw): Get these tests passing on Android too. http://crbug.com/486220
@@ -45,11 +50,6 @@ if config.target_os != config.OS_ANDROID:
"type": "gtest_isolated",
},
{
- "test": "mojo:view_manager_apptests",
- "type": "gtest_isolated",
- "args": ["--use-headless-config"]
- },
- {
"test": "mojo:resource_provider_apptests",
"type": "gtest_isolated",
},