Make test filters play nice

base/test/launcher/test_launcher.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_
 #define BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 163 matching lines @@
 
   TestLauncherDelegate* launcher_delegate_;
 
   // Support for outer sharding, just like gtest does.
   int32_t total_shards_;  // Total number of outer shards, at least one.
   int32_t shard_index_;   // Index of shard the launcher is to run.
 
   int cycles_;  // Number of remaining test itreations, or -1 for infinite.
 
   // Test filters (empty means no filter).
+  std::vector<std::string> positive_test_filter_gtest_;

[Paweł Hajdan Jr., 2016/11/28 12:56:14]

nit: I'd suggest "flag", "cmdline", or similar suffix.

[katthomas, 2016/11/29 21:38:26]

Acknowledged.

+  std::vector<std::string> positive_test_filter_file_;
   std::vector<std::string> positive_test_filter_;

[Paweł Hajdan Jr., 2016/11/28 12:56:14]

Do we need this old variable? If yes, why?

[katthomas, 2016/11/29 21:38:26]

Yes, it is still used.

   std::vector<std::string> negative_test_filter_;

[Dirk Pranke, 2016/11/29 02:07:15]

Even though you only need a single negative_test_filter_, it might be easier to
follow the code if you had two of them, to mirror the positive filters.

[katthomas, 2016/11/29 21:38:26]

Done.

 
   // Tests to use (cached result of TestLauncherDelegate::GetTests).
   std::vector<TestIdentifier> tests_;
 
   // Number of tests found in this binary.
   size_t test_found_count_;
 
   // Number of tests started in this iteration.
   size_t test_started_count_;
 
@@ skipping 39 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestLauncher);
 };
 
 // Extract part from |full_output| that applies to |result|.
 std::string GetTestOutputSnippet(const TestResult& result,
                                  const std::string& full_output);
 
 }  // namespace base
 
 #endif  // BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_