From 8dddd3ccaa9485de255e2357eea208a8a8c414b6 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 8 Aug 2014 10:09:11 +0000 Subject: Fix how --gtest_filter interacts with PRE_ tests BUG=371785 R=sky@chromium.org Review URL: https://codereview.chromium.org/445953002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288298 0039d316-1c4b-4281-b951-d872f2087c98 --- base/test/launcher/test_launcher.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'base/test') diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc index ca60cba..6005db2 100644 --- a/base/test/launcher/test_launcher.cc +++ b/base/test/launcher/test_launcher.cc @@ -805,6 +805,9 @@ void TestLauncher::RunTests() { continue; } + if (!launcher_delegate_->ShouldRunTest(test_case, test_info)) + continue; + // Skip the test that doesn't match the filter (if given). if (!positive_test_filter_.empty()) { bool found = false; @@ -828,9 +831,6 @@ void TestLauncher::RunTests() { if (excluded) continue; - if (!launcher_delegate_->ShouldRunTest(test_case, test_info)) - continue; - if (base::Hash(test_name) % total_shards_ != static_cast(shard_index_)) { continue; -- cgit v1.1