| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/test/test_suite.h" | 5 #include "ash/test/test_suite.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | |
| 8 #include "base/command_line.h" | |
| 9 #include "base/win/windows_version.h" | |
| 10 #endif | |
| 11 | |
| 12 int main(int argc, char** argv) { | 7 int main(int argc, char** argv) { |
| 13 #if defined(OS_WIN) | |
| 14 CommandLine::Init(argc, argv); | |
| 15 // Disabled on Win8 until they're passing cleanly. http://crbug.com/154081 | |
| 16 // Can be optionally enabled via a command line flag (handy for developing) | |
| 17 // until such time. | |
| 18 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && | |
| 19 !CommandLine::ForCurrentProcess()->HasSwitch("ash-metro-tests")) | |
| 20 return 0; | |
| 21 #endif | |
| 22 return ash::test::AuraShellTestSuite(argc, argv).Run(); | 8 return ash::test::AuraShellTestSuite(argc, argv).Run(); |
| 23 } | 9 } |
| OLD | NEW |
|---|
Chromium Code Reviews
