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

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

Issue 412683003: Switch webkit_unit_tests to use the new test launcher. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix gyp for non-component 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 | « Source/web/tests/WebUnitTests.h ('k') | Source/web/web.gyp » ('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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 #include "config.h" 31 #include "config.h"
32 #include "web/tests/WebUnitTests.h" 32 #include "web/tests/WebUnitTests.h"
33 33
34 // FIXME: Can we move this to webkit/support and fix the layering violation? 34 #include <base/bind.h>
35 #include <base/message_loop/message_loop.h>
36 #include <base/run_loop.h>
37 #include <base/test/launcher/unit_test_launcher.h>
35 #include <base/test/test_suite.h> 38 #include <base/test/test_suite.h>
36 39
37 static TestSuite* testSuite = 0;
38
39 namespace blink { 40 namespace blink {
40 41
41 void InitTestSuite(int argc, char** argv) 42 namespace {
43
44 int runHelper(TestSuite* testSuite, void (*preTestHook)(void), void (*postTestHo ok)(void))
42 { 45 {
43 testSuite = new TestSuite(argc, argv); 46 preTestHook();
44 }
45
46 int RunAllUnitTests()
47 {
48 int result = testSuite->Run(); 47 int result = testSuite->Run();
49 48 postTestHook();
50 return result; 49 return result;
51 } 50 }
52 51
53 void DeleteTestSuite() 52 } // namespace
53
54 int runWebTests(int argc, char** argv, void (*preTestHook)(void), void (*postTes tHook)(void))
54 { 55 {
55 delete testSuite; 56 TestSuite testSuite(argc, argv);
56 testSuite = 0; 57 return base::LaunchUnitTests(argc, argv, base::Bind(&runHelper, base::Unreta ined(&testSuite), preTestHook, postTestHook));
57 } 58 }
58 59
59 } // namespace blink 60 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/WebUnitTests.h ('k') | Source/web/web.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698