diff options
| author | sky <sky@chromium.org> | 2016-03-01 10:51:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 18:52:24 +0000 |
| commit | c6252d34eb315422b95cd76a7c710e3ce0264f46 (patch) | |
| tree | c5da820a8e7ba961988862b066d100af9e434fd1 | |
| parent | a853c29e66ef5f85ee51dadfae9b224228b8c5f5 (diff) | |
| download | chromium_src-c6252d34eb315422b95cd76a7c710e3ce0264f46.zip chromium_src-c6252d34eb315422b95cd76a7c710e3ce0264f46.tar.gz chromium_src-c6252d34eb315422b95cd76a7c710e3ce0264f46.tar.bz2 | |
Make it BackgroundShellTest.Basic is only disabled on android
It only fails on android, not other platforms.
R=msramek@chromium.org
TBR=msramek@chromium.org
BUG=589784
Review URL: https://codereview.chromium.org/1757483002
Cr-Commit-Position: refs/heads/master@{#378493}
| -rw-r--r-- | mojo/shell/background/tests/background_shell_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mojo/shell/background/tests/background_shell_unittest.cc b/mojo/shell/background/tests/background_shell_unittest.cc index dbadeb9..ccaf3ea 100644 --- a/mojo/shell/background/tests/background_shell_unittest.cc +++ b/mojo/shell/background/tests/background_shell_unittest.cc @@ -38,9 +38,14 @@ scoped_ptr<TestApplicationCatalogStore> BuildTestApplicationCatalogStore() { // Uses BackgroundShell to start the shell in the background and connects to // background_shell_test_app, verifying we can send a message to the app. // An ApplicationCatalogStore is supplied to avoid using a manifest. +#if defined(OS_ANDROID) // TODO(crbug.com/589784): This test is disabled, as it fails // on the Android GN bot. -TEST(BackgroundShellTest, DISABLED_Basic) { +#define MAYBE_Basic DISABLED_Basic +#else +#define MAYBE_Basic Basic +#endif +TEST(BackgroundShellTest, MAYBE_Basic) { base::MessageLoop message_loop; BackgroundShell background_shell; scoped_ptr<BackgroundShell::InitParams> init_params( |