Chromium Code Reviews

Side by Side Diff: base/test/launcher/unit_test_launcher.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « base/test/launcher/test_launcher_ios.cc ('k') | base/test/launcher/unit_test_launcher_ios.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/launcher/unit_test_launcher.h" 5 #include "base/test/launcher/unit_test_launcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 100 matching lines...)
111 DCHECK(thread_checker_.CalledOnValidThread()); 111 DCHECK(thread_checker_.CalledOnValidThread());
112 } 112 }
113 113
114 private: 114 private:
115 struct GTestCallbackState { 115 struct GTestCallbackState {
116 TestLauncher* test_launcher; 116 TestLauncher* test_launcher;
117 std::vector<std::string> test_names; 117 std::vector<std::string> test_names;
118 FilePath output_file; 118 FilePath output_file;
119 }; 119 };
120 120
121 bool ShouldRunTest(const testing::TestCase* test_case, 121 bool ShouldRunTest(const std::string& test_case_name,
122 const testing::TestInfo* test_info) override { 122 const std::string& test_name) override {
123 DCHECK(thread_checker_.CalledOnValidThread()); 123 DCHECK(thread_checker_.CalledOnValidThread());
124 124
125 // There is no additional logic to disable specific tests. 125 // There is no additional logic to disable specific tests.
126 return true; 126 return true;
127 } 127 }
128 128
129 size_t RunTests(TestLauncher* test_launcher, 129 size_t RunTests(TestLauncher* test_launcher,
130 const std::vector<std::string>& test_names) override { 130 const std::vector<std::string>& test_names) override {
131 DCHECK(thread_checker_.CalledOnValidThread()); 131 DCHECK(thread_checker_.CalledOnValidThread());
132 132
(...skipping 434 matching lines...)
567 CommandLine::Init(argc, NULL); 567 CommandLine::Init(argc, NULL);
568 return LaunchUnitTestsInternal( 568 return LaunchUnitTestsInternal(
569 run_test_suite, 569 run_test_suite,
570 SysInfo::NumberOfProcessors(), 570 SysInfo::NumberOfProcessors(),
571 use_job_objects, 571 use_job_objects,
572 Bind(&InitGoogleTestWChar, &argc, argv)); 572 Bind(&InitGoogleTestWChar, &argc, argv));
573 } 573 }
574 #endif // defined(OS_WIN) 574 #endif // defined(OS_WIN)
575 575
576 } // namespace base 576 } // namespace base
OLDNEW
« no previous file with comments | « base/test/launcher/test_launcher_ios.cc ('k') | base/test/launcher/unit_test_launcher_ios.cc » ('j') | no next file with comments »

Powered by Google App Engine