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 124 matching lines @@
 
   // Called when a test has finished running.
   void OnTestFinished(const TestResult& result);
 
  private:
   bool Init() WARN_UNUSED_RESULT;
 
   // Runs all tests in current iteration. Uses callbacks to communicate success.
   void RunTests();
 
+  void CombineTestFilters();
+
   void RunTestIteration();
 
   // Saves test results summary as JSON if requested from command line.
   void MaybeSaveSummaryAsJSON(const std::vector<std::string>& additional_tags);
 
   // Called on a worker thread after a child process finishes.
   void OnLaunchTestProcessFinished(
       const GTestProcessCompletedCallback& callback,
       int exit_code,
       const TimeDelta& elapsed_time,
@@ skipping 19 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).
+  bool has_positive_filter;

[Paweł Hajdan Jr., 2016/11/30 12:41:32]

nit: All member variables should end with "_".

By the way, do we really need this variable?

[katthomas, 2016/12/01 00:07:01]

We don't _need_ it, but I think it makes the code more readable and easier to
understand.

+  std::vector<std::string> positive_test_filter_gtest_;
+  std::vector<std::string> positive_test_filter_file_;
   std::vector<std::string> positive_test_filter_;
+  std::vector<std::string> negative_test_filter_gtest_;
+  std::vector<std::string> negative_test_filter_file_;
   std::vector<std::string> negative_test_filter_;
 
   // 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 40 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_