| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <base/test/test_suite.h> | 5 #include <base/test/test_suite.h> |
| 6 #include <gmock/gmock.h> | 6 #include <gmock/gmock.h> |
| 7 |
| 8 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
| 7 #include <webkit/support/webkit_support.h> | 9 #include <webkit/support/webkit_support.h> |
| 10 #endif |
| 8 | 11 |
| 9 int main(int argc, char** argv) { | 12 int main(int argc, char** argv) { |
| 10 ::testing::InitGoogleMock(&argc, argv); | 13 ::testing::InitGoogleMock(&argc, argv); |
| 11 TestSuite testSuite(argc, argv); | 14 TestSuite testSuite(argc, argv); |
| 15 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
| 12 webkit_support::SetUpTestEnvironmentForUnitTests(); | 16 webkit_support::SetUpTestEnvironmentForUnitTests(); |
| 17 #endif |
| 13 int result = testSuite.Run(); | 18 int result = testSuite.Run(); |
| 19 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
| 14 webkit_support::TearDownTestEnvironment(); | 20 webkit_support::TearDownTestEnvironment(); |
| 21 #endif |
| 15 | 22 |
| 16 return result; | 23 return result; |
| 17 } | 24 } |
| 18 | 25 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10920056:
Make cc_unittests and webkit_compositor_unittests executable always (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src