diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 21:54:54 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 21:54:54 +0000 |
| commit | 0f79893bfd2a3c5bcc20bd32ad9b509f0e157115 (patch) | |
| tree | 5f1beae95511cadcc73e61cb2905e272b5f772dd /base/test | |
| parent | a30d4f91f32506e82e9edd45133632a5340f9920 (diff) | |
| download | chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.zip chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.tar.gz chromium_src-0f79893bfd2a3c5bcc20bd32ad9b509f0e157115.tar.bz2 | |
Revert "Revert 231359 "GTTF: make sharding_supervisor.py use --brave-new...""
This reverts commit 94094b6f47c929e5ebaa54eb2627c93e7367399f.
Looks like interactive_ui_tests passed on the next build that didn't have the revert yet.
TBR=maruel
BUG=236893
Review URL: https://codereview.chromium.org/49843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/launcher/test_launcher.cc | 3 | ||||
| -rw-r--r-- | base/test/launcher/test_launcher.h | 10 | ||||
| -rw-r--r-- | base/test/launcher/unit_test_launcher.cc | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc index f2766a7..9c06a1a 100644 --- a/base/test/launcher/test_launcher.cc +++ b/base/test/launcher/test_launcher.cc @@ -461,8 +461,7 @@ void TestLauncher::RunTests() { } } - test_started_count_ = test_names.size(); - launcher_delegate_->RunTests(this, test_names); + test_started_count_ = launcher_delegate_->RunTests(this, test_names); if (test_started_count_ == 0) { fprintf(stdout, "0 tests run\n"); diff --git a/base/test/launcher/test_launcher.h b/base/test/launcher/test_launcher.h index 10bb266..eee9851 100644 --- a/base/test/launcher/test_launcher.h +++ b/base/test/launcher/test_launcher.h @@ -58,10 +58,12 @@ class TestLauncherDelegate { const testing::TestInfo* test_info) = 0; // Called to make the delegate run the specified tests. The delegate must - // call |test_launcher|'s OnTestFinished method once per every test in - // |test_names|, regardless of its success. - virtual void RunTests(TestLauncher* test_launcher, - const std::vector<std::string>& test_names) = 0; + // return the number of actual tests it's going to run (can be smaller, + // equal to, or larger than size of |test_names|). It must also call + // |test_launcher|'s OnTestFinished method once per every run test, + // regardless of its success. + virtual size_t RunTests(TestLauncher* test_launcher, + const std::vector<std::string>& test_names) = 0; // Called to make the delegate retry the specified tests. The delegate must // return the number of actual tests it's going to retry (can be smaller, diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc index 7db94bf..63c64c9 100644 --- a/base/test/launcher/unit_test_launcher.cc +++ b/base/test/launcher/unit_test_launcher.cc @@ -115,8 +115,8 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate { return true; } - virtual void RunTests(TestLauncher* test_launcher, - const std::vector<std::string>& test_names) OVERRIDE { + virtual size_t RunTests(TestLauncher* test_launcher, + const std::vector<std::string>& test_names) OVERRIDE { DCHECK(thread_checker_.CalledOnValidThread()); std::vector<std::string> batch; @@ -130,6 +130,8 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate { } RunBatch(test_launcher, batch); + + return test_names.size(); } virtual size_t RetryTests( |