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

Side by Side Diff: Source/web/tests/RunAllTests.cpp

Issue 401733002: No need to call InitGoogleMock() ourselves. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/web/tests/WebUnitTests.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 25 matching lines...) Expand all
36 #include <base/test/test_suite.h> 36 #include <base/test/test_suite.h>
37 37
38 #include "public/platform/Platform.h" 38 #include "public/platform/Platform.h"
39 #include "public/web/WebKit.h" 39 #include "public/web/WebKit.h"
40 #include <content/test/webkit_unit_test_support.h> 40 #include <content/test/webkit_unit_test_support.h>
41 41
42 #if defined(BLINK_DLL_UNITTEST) 42 #if defined(BLINK_DLL_UNITTEST)
43 #include "web/tests/WebUnitTests.h" 43 #include "web/tests/WebUnitTests.h"
44 #endif 44 #endif
45 45
46 #include <gmock/gmock.h>
47
48 // TestSuite must be created before SetUpTestEnvironment so it performs 46 // TestSuite must be created before SetUpTestEnvironment so it performs
49 // initializations needed by WebKit support. This is slightly complicated by the 47 // 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 48 // fact that chromium multi-dll build requires that the TestSuite object be crea ted
51 // and run inside blink_web.dll. 49 // and run inside blink_web.dll.
52 int main(int argc, char** argv) 50 int main(int argc, char** argv)
53 { 51 {
54 #if defined(BLINK_DLL_UNITTEST) 52 #if defined(BLINK_DLL_UNITTEST)
55 blink::InitTestSuite(argc, argv); 53 blink::InitTestSuite(argc, argv);
56 content::SetUpTestEnvironmentForWebKitUnitTests(); 54 content::SetUpTestEnvironmentForWebKitUnitTests();
57 int result = blink::RunAllUnitTests(); 55 int result = blink::RunAllUnitTests();
58 content::TearDownEnvironmentForWebKitUnitTests(); 56 content::TearDownEnvironmentForWebKitUnitTests();
59 blink::DeleteTestSuite(); 57 blink::DeleteTestSuite();
60 #else 58 #else
61 ::testing::InitGoogleMock(&argc, argv);
62 TestSuite testSuite(argc, argv); 59 TestSuite testSuite(argc, argv);
63 content::SetUpTestEnvironmentForWebKitUnitTests(); 60 content::SetUpTestEnvironmentForWebKitUnitTests();
64 int result = testSuite.Run(); 61 int result = testSuite.Run();
65 content::TearDownEnvironmentForWebKitUnitTests(); 62 content::TearDownEnvironmentForWebKitUnitTests();
66 #endif 63 #endif
67 64
68 return result; 65 return result;
69 } 66 }
OLDNEW
« no previous file with comments | « no previous file | Source/web/tests/WebUnitTests.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698