Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2321)

Unified Diff: ash/test/ash_unittests.cc

Issue 12279002: Revert 182703, this broke on win aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_unittests.cc
===================================================================
--- ash/test/ash_unittests.cc (revision 182715)
+++ ash/test/ash_unittests.cc (working copy)
@@ -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();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698