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 13 matching lines...) Expand all Loading... |
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 #undef FROM_HERE // Make sure we get the base FROM_HERE and not Blink FROM_HERE |
34 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" |
35 #include <base/bind.h> | 36 #include <base/bind.h> |
36 #include <base/message_loop/message_loop.h> | 37 #include <base/message_loop/message_loop.h> |
37 #include <base/run_loop.h> | 38 #include <base/run_loop.h> |
38 #include <base/test/launcher/unit_test_launcher.h> | 39 #include <base/test/launcher/unit_test_launcher.h> |
39 #include <base/test/test_suite.h> | 40 #include <base/test/test_suite.h> |
40 #include <v8.h> | 41 #include <v8.h> |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 | 44 |
(...skipping 21 matching lines...) Expand all Loading... |
65 | 66 |
66 } // namespace | 67 } // namespace |
67 | 68 |
68 int runWebTests(int argc, char** argv, void (*preTestHook)(void), void (*postTes
tHook)(void)) | 69 int runWebTests(int argc, char** argv, void (*preTestHook)(void), void (*postTes
tHook)(void)) |
69 { | 70 { |
70 base::TestSuite testSuite(argc, argv); | 71 base::TestSuite testSuite(argc, argv); |
71 return base::LaunchUnitTests(argc, argv, base::Bind(&runHelper, base::Unreta
ined(&testSuite), preTestHook, postTestHook)); | 72 return base::LaunchUnitTests(argc, argv, base::Bind(&runHelper, base::Unreta
ined(&testSuite), preTestHook, postTestHook)); |
72 } | 73 } |
73 | 74 |
74 } // namespace blink | 75 } // namespace blink |
OLD | NEW |