OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... | |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #if WEBKIT_IMPLEMENTATION | 31 #if WEBKIT_IMPLEMENTATION |
32 #include "config.h" | 32 #include "config.h" |
33 #endif | 33 #endif |
34 | 34 |
35 // FIXME: Avoid this source dependency on Chromium's base module. | 35 #include "RuntimeEnabledFeatures.h" |
36 #include <base/test/test_suite.h> | |
37 | |
38 #include "WebKit.h" | 36 #include "WebKit.h" |
37 #include <base/test/test_suite.h> // FIXME: Avoid this source dependency on Chro mium's base module. | |
Alpha Left Google
2013/04/25 22:07:12
Is it important to reorder these includes? If not
urvang (Google)
2013/04/26 01:46:23
Yes, this was needed to make 'check-webkit-style'
| |
39 #include <public/Platform.h> | 38 #include <public/Platform.h> |
40 #include <webkit/support/webkit_support.h> | 39 #include <webkit/support/webkit_support.h> |
41 | 40 |
42 #if defined(WEBKIT_DLL_UNITTEST) | 41 #if defined(WEBKIT_DLL_UNITTEST) |
43 #include "WebUnitTests.h" | 42 #include "WebUnitTests.h" |
44 #endif | 43 #endif |
45 | 44 |
46 #include <gmock/gmock.h> | 45 #include <gmock/gmock.h> |
47 | 46 |
48 // TestSuite must be created before SetUpTestEnvironment so it performs | 47 // TestSuite must be created before SetUpTestEnvironment so it performs |
49 // initializations needed by WebKit support. This is slightly complicated by the | 48 // initializations needed by WebKit support. This is slightly complicated by the |
50 // fact that chromium multi-dll build requires that the TestSuite object be crea ted | 49 // fact that chromium multi-dll build requires that the TestSuite object be crea ted |
51 // and run inside webkit.dll. | 50 // and run inside webkit.dll. |
52 int main(int argc, char** argv) | 51 int main(int argc, char** argv) |
53 { | 52 { |
53 WebCore::RuntimeEnabledFeatures::setAnimatedWebPEnabled(true); | |
Alpha Left Google
2013/04/25 22:07:12
I suggest doing this only in WebP test. You can de
urvang (Google)
2013/04/26 01:46:23
Done.
| |
54 #if defined(WEBKIT_DLL_UNITTEST) | 54 #if defined(WEBKIT_DLL_UNITTEST) |
55 WebKit::InitTestSuite(argc, argv); | 55 WebKit::InitTestSuite(argc, argv); |
56 webkit_support::SetUpTestEnvironmentForUnitTests(); | 56 webkit_support::SetUpTestEnvironmentForUnitTests(); |
57 int result = WebKit::RunAllUnitTests(); | 57 int result = WebKit::RunAllUnitTests(); |
58 webkit_support::TearDownTestEnvironment(); | 58 webkit_support::TearDownTestEnvironment(); |
59 WebKit::DeleteTestSuite(); | 59 WebKit::DeleteTestSuite(); |
60 #else | 60 #else |
61 ::testing::InitGoogleMock(&argc, argv); | 61 ::testing::InitGoogleMock(&argc, argv); |
62 TestSuite testSuite(argc, argv); | 62 TestSuite testSuite(argc, argv); |
63 webkit_support::SetUpTestEnvironmentForUnitTests(); | 63 webkit_support::SetUpTestEnvironmentForUnitTests(); |
64 int result = testSuite.Run(); | 64 int result = testSuite.Run(); |
65 webkit_support::TearDownTestEnvironment(); | 65 webkit_support::TearDownTestEnvironment(); |
66 #endif | 66 #endif |
67 | 67 |
68 return result; | 68 return result; |
69 } | 69 } |
OLD | NEW |