| Index: base/test/launcher/test_results_tracker.h
|
| diff --git a/base/test/launcher/test_results_tracker.h b/base/test/launcher/test_results_tracker.h
|
| index 2bddebc56ed03ce7b733fd1789cd0c66f8664fa9..53a4e560f8ac5cef8c600fa03230e74929d5d2e6 100644
|
| --- a/base/test/launcher/test_results_tracker.h
|
| +++ b/base/test/launcher/test_results_tracker.h
|
| @@ -42,7 +42,7 @@ class TestResultsTracker {
|
|
|
| // Adds |test_name| to the set of discovered tests (this includes all tests
|
| // present in the executable, not necessarily run).
|
| - void AddTest(const std::string& test_name);
|
| + void AddTest(const std::string& test_name, const std::string& file, int line);
|
|
|
| // Adds |test_name| to the set of disabled tests.
|
| void AddDisabledTest(const std::string& test_name);
|
| @@ -77,6 +77,11 @@ class TestResultsTracker {
|
| private:
|
| void GetTestStatusForIteration(int iteration, TestStatusMap* map) const;
|
|
|
| + template<typename InputIterator>
|
| + void PrintTests(InputIterator first,
|
| + InputIterator last,
|
| + const std::string& description) const;
|
| +
|
| struct AggregateTestResult {
|
| AggregateTestResult();
|
| ~AggregateTestResult();
|
| @@ -93,6 +98,14 @@ class TestResultsTracker {
|
| ResultsMap results;
|
| };
|
|
|
| + struct CodeLocation {
|
| + CodeLocation(const std::string& f, int l) : file(f), line(l) {
|
| + }
|
| +
|
| + std::string file;
|
| + int line;
|
| + };
|
| +
|
| ThreadChecker thread_checker_;
|
|
|
| // Set of global tags, i.e. strings indicating conditions that apply to
|
| @@ -102,6 +115,8 @@ class TestResultsTracker {
|
| // Set of all test names discovered in the current executable.
|
| std::set<std::string> all_tests_;
|
|
|
| + std::map<std::string, CodeLocation> test_locations_;
|
| +
|
| // Set of all disabled tests in the current executable.
|
| std::set<std::string> disabled_tests_;
|
|
|
|
|