diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 10:09:11 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 10:09:11 +0000 |
| commit | 8dddd3ccaa9485de255e2357eea208a8a8c414b6 (patch) | |
| tree | c7baf500b4493b0c2feff9aae8110a73034ba90d /base/test | |
| parent | ea314c3d9b9b75aadde18f3d5e09c2675c73f92f (diff) | |
| download | chromium_src-8dddd3ccaa9485de255e2357eea208a8a8c414b6.zip chromium_src-8dddd3ccaa9485de255e2357eea208a8a8c414b6.tar.gz chromium_src-8dddd3ccaa9485de255e2357eea208a8a8c414b6.tar.bz2 | |
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
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/launcher/test_launcher.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<uint32>(shard_index_)) { continue; |