OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/bind.h" | |
6 #include "base/test/launcher/unit_test_launcher.h" | |
7 #include "base/test/test_suite.h" | |
5 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
6 #include "sandbox/win/tests/common/controller.h" | 9 #include "sandbox/win/tests/common/controller.h" |
7 | 10 |
8 int wmain(int argc, wchar_t **argv) { | 11 int wmain(int argc, wchar_t **argv) { |
9 if (argc >= 2) { | 12 if (argc >= 2) { |
10 if (0 == _wcsicmp(argv[1], L"-child") || | 13 if (0 == _wcsicmp(argv[1], L"-child") || |
11 0 == _wcsicmp(argv[1], L"-child-no-sandbox")) | 14 0 == _wcsicmp(argv[1], L"-child-no-sandbox")) |
12 // This instance is a child, not the test. | 15 // This instance is a child, not the test. |
13 return sandbox::DispatchCall(argc, argv); | 16 return sandbox::DispatchCall(argc, argv); |
14 } | 17 } |
15 | 18 |
16 testing::InitGoogleTest(&argc, argv); | 19 TestSuite test_suite(argc, argv); |
17 return RUN_ALL_TESTS(); | 20 return base::LaunchUnitTests( |
21 argc, argv, false, base::Bind( | |
rvargas (doing something else)
2014/06/06 18:55:39
nit: move bas::Bind to the next line (so the third
Paweł Hajdan Jr.
2014/06/09 09:08:33
Done.
| |
22 &base::TestSuite::Run, base::Unretained(&test_suite))); | |
18 } | 23 } |
OLD | NEW |