summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-12-30 12:04:21 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-30 20:05:26 +0000
commit42f9a3bcdbe0c6ac386307f7ee95765045e3fcfd (patch)
treefac2458a8a49a457b2f10550d7f2ba91371c7814 /mojo
parent59f7664f538095900d17f139050ea011fd18094b (diff)
downloadchromium_src-42f9a3bcdbe0c6ac386307f7ee95765045e3fcfd.zip
chromium_src-42f9a3bcdbe0c6ac386307f7ee95765045e3fcfd.tar.gz
chromium_src-42f9a3bcdbe0c6ac386307f7ee95765045e3fcfd.tar.bz2
Disables mash_wm_tests until build/scripts are straightened out
It looks like we may try to run these tests even if the we didn't build them. No doubt I'm misunderstanding how the buildbots work with mojo_apptests.py. BUG=569367 TEST=none TBR=msw@chromium.org R=msw@chromium.org Review URL: https://codereview.chromium.org/1554733002 Cr-Commit-Position: refs/heads/master@{#367175}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/tools/data/apptests13
1 files changed, 7 insertions, 6 deletions
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index 8c7c37f..2d900bd 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -76,12 +76,13 @@ if config.target_os != config.OS_ANDROID:
'test': 'mojo:mandoline_browser_apptests',
'type': 'gtest_isolated',
},
- {
- 'test': 'mojo:mash_wm_apptests',
- 'type': 'gtest_isolated',
- 'args': ['--use-x11-test-config',
- '--override-use-gl-with-osmesa-for-tests']
- },
+ # TODO(sky): reenable when 569367 is fixed.
+# {
+# 'test': 'mojo:mash_wm_apptests',
+# 'type': 'gtest_isolated',
+# 'args': ['--use-x11-test-config',
+# '--override-use-gl-with-osmesa-for-tests']
+# },
# TODO(xhwang): Fix and enable mojo:media_pipeline_integration_apptests.
# http://crbug.com/501417
{