OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 16 matching lines...) Expand all Loading... | |
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 #include "platform/heap/Heap.h" | 31 #include "platform/heap/Heap.h" |
32 #include <base/bind.h> | 32 #include <base/bind.h> |
33 #include <base/test/launcher/unit_test_launcher.h> | 33 #include <base/test/launcher/unit_test_launcher.h> |
34 #include <base/test/test_suite.h> | 34 #include <base/test/test_suite.h> |
35 #include <base/time/time.h> | 35 #include <base/time/time.h> |
36 #include <content/test/blink_test_environment.h> | 36 #include <content/test/blink_test_environment.h> |
37 #include <mojo/edk/embedder/embedder.h> | |
37 #include <string.h> | 38 #include <string.h> |
38 | 39 |
39 class BlinkTestEnvironmentScope { | 40 class BlinkTestEnvironmentScope { |
40 public: | 41 public: |
41 BlinkTestEnvironmentScope() { content::SetUpBlinkTestEnvironment(); } | 42 BlinkTestEnvironmentScope() { content::SetUpBlinkTestEnvironment(); } |
42 ~BlinkTestEnvironmentScope() { content::TearDownBlinkTestEnvironment(); } | 43 ~BlinkTestEnvironmentScope() { content::TearDownBlinkTestEnvironment(); } |
43 }; | 44 }; |
44 | 45 |
45 int runHelper(base::TestSuite* testSuite) { | 46 int runHelper(base::TestSuite* testSuite) { |
47 mojo::edk::Init(); | |
haraken
2016/10/27 16:13:15
Do we need this? I don't think platform/heap/*test
leonhsl(Using Gerrit)
2016/10/28 05:59:06
At line42 in this one RunAllTests.cpp, it is calli
| |
46 BlinkTestEnvironmentScope blinkTestEnvironment; | 48 BlinkTestEnvironmentScope blinkTestEnvironment; |
47 blink::ThreadState* currentThreadState = blink::ThreadState::current(); | 49 blink::ThreadState* currentThreadState = blink::ThreadState::current(); |
48 currentThreadState->registerTraceDOMWrappers(nullptr, nullptr, nullptr, | 50 currentThreadState->registerTraceDOMWrappers(nullptr, nullptr, nullptr, |
49 nullptr); | 51 nullptr); |
50 int result = testSuite->Run(); | 52 int result = testSuite->Run(); |
51 currentThreadState->collectAllGarbage(); | 53 currentThreadState->collectAllGarbage(); |
52 return result; | 54 return result; |
53 } | 55 } |
54 | 56 |
55 int main(int argc, char** argv) { | 57 int main(int argc, char** argv) { |
56 base::TestSuite testSuite(argc, argv); | 58 base::TestSuite testSuite(argc, argv); |
57 return base::LaunchUnitTests( | 59 return base::LaunchUnitTests( |
58 argc, argv, base::Bind(runHelper, base::Unretained(&testSuite))); | 60 argc, argv, base::Bind(runHelper, base::Unretained(&testSuite))); |
59 } | 61 } |
OLD | NEW |