diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 15:44:40 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 15:44:40 +0000 |
| commit | 1597b71e45ad1438d3b399d3297c8515b3015e56 (patch) | |
| tree | d28da45ff6d527f84579cd0bcf3e87ca08f9d465 /ash | |
| parent | 36cb60808422968817bb1154fcb9aaeddb6a077e (diff) | |
| download | chromium_src-1597b71e45ad1438d3b399d3297c8515b3015e56.zip chromium_src-1597b71e45ad1438d3b399d3297c8515b3015e56.tar.gz chromium_src-1597b71e45ad1438d3b399d3297c8515b3015e56.tar.bz2 | |
Revert 182703, this broke on win aura.
> Enable win8 ash tests.
>
> BUG=154081
> TEST=ash_unittests.exe run on the Win8 bot.
>
>
> Review URL: https://chromiumcodereview.appspot.com/12259011
TBR=robertshield@chromium.org
Review URL: https://codereview.chromium.org/12279002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/test/ash_unittests.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc index 7602d9a..7374ada 100644 --- a/ash/test/ash_unittests.cc +++ b/ash/test/ash_unittests.cc @@ -4,6 +4,20 @@ #include "ash/test/test_suite.h" +#if defined(OS_WIN) +#include "base/command_line.h" +#include "base/win/windows_version.h" +#endif + int main(int argc, char** argv) { +#if defined(OS_WIN) + CommandLine::Init(argc, argv); + // Disabled on Win8 until they're passing cleanly. http://crbug.com/154081 + // Can be optionally enabled via a command line flag (handy for developing) + // until such time. + if (base::win::GetVersion() >= base::win::VERSION_WIN8 && + !CommandLine::ForCurrentProcess()->HasSwitch("ash-metro-tests")) + return 0; +#endif return ash::test::AuraShellTestSuite(argc, argv).Run(); } |