Merge topic 'serverFixTestDiscovery'

fe2c2b0f server: ctestInfo fix to return all tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1479

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 7c27aefc06..5e87393581 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -617,11 +617,6 @@ public:
   cmGlobalGenerator* GetGlobalGenerator() const;
 
   /**
-   * Get all the test names this makefile knows about
-   */
-  void GetTestNames(std::vector<std::string>& testNames);
-
-  /**
    * Get all the source files this makefile knows about
    */
   const std::vector<cmSourceFile*>& GetSourceFiles() const
@@ -644,6 +639,11 @@ public:
   cmTest* GetTest(const std::string& testName) const;
 
   /**
+   * Get all tests that run under the given configuration.
+   */
+  void GetTests(const std::string& config, std::vector<cmTest*>& tests);
+
+  /**
    * Return a location of a file in cmake or custom modules directory
    */
   std::string GetModulesFile(const char* name) const;