Merge topic 'ctest-updates'

d9195ab081 Tests: Teach run_ctest to handle removal of CTestConfig.cmake
1ca53f5ef1 Remove unnecessary CTEST_PROJECT_NAME variables
15ac4aae0e Remove warning when no CTestConfig.cmake file exists
3125c47d27 ctest_build: Do not require unnecessary [CTEST_]PROJECT_NAME value
36bbd07a76 CDashUpload: Use the query part of the submit url as field
e1dfe8cee6 CTest: Don't require 'submit.php?' in submit location

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2640

Help/command/ctest_build.rst

@@ -50,9 +50,7 @@ The options are:
   for an example.
 
 ``PROJECT_NAME <project-name>``
-  Set the name of the project to build.  This should correspond
-  to the top-level call to the :command:`project` command.
-  If not specified the ``CTEST_PROJECT_NAME`` variable will be checked.
+  Ignored.  This was once used but is no longer needed.
 
 ``TARGET <target-name>``
   Specify the name of a target to build.  If not specified the

Modules/CTest.cmake

@@ -27,7 +27,6 @@ to creating tests when testing is enabled.
 To enable submissions to a CDash server, create a ``CTestConfig.cmake``
 file at the top of the project with content such as::
 
-  set(CTEST_PROJECT_NAME "MyProject")
   set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
   set(CTEST_DROP_METHOD "http")
   set(CTEST_DROP_SITE "my.cdash.org")

Source/CTest/cmCTestBuildCommand.cxx

@@ -53,10 +53,6 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
   } else {
     const char* cmakeGeneratorName =
       this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
-    const char* cmakeProjectName =
-      (this->Values[ctb_PROJECT_NAME] && *this->Values[ctb_PROJECT_NAME])
-      ? this->Values[ctb_PROJECT_NAME]
-      : this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
 
     // Build configuration is determined by: CONFIGURATION argument,
     // or CTEST_BUILD_CONFIGURATION script variable, or
@@ -81,8 +77,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
       ? this->Values[ctb_TARGET]
       : this->Makefile->GetDefinition("CTEST_BUILD_TARGET");
 
-    if (cmakeGeneratorName && *cmakeGeneratorName && cmakeProjectName &&
-        *cmakeProjectName) {
+    if (cmakeGeneratorName && *cmakeGeneratorName) {
       if (!cmakeBuildConfiguration) {
         cmakeBuildConfiguration = "Release";
       }
@@ -132,14 +127,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
       /* clang-format off */
       ostr << "has no project to build. If this is a "
         "\"built with CMake\" project, verify that CTEST_CMAKE_GENERATOR "
-        "and CTEST_PROJECT_NAME are set."
-        "\n"
-        "CTEST_PROJECT_NAME is usually set in CTestConfig.cmake. Verify "
-        "that CTestConfig.cmake exists, or CTEST_PROJECT_NAME "
-        "is set in the script, or PROJECT_NAME is passed as an argument "
-        "to ctest_build."
-        "\n"
-        "Alternatively, set CTEST_BUILD_COMMAND to build the project "
+        "is set. Otherwise, set CTEST_BUILD_COMMAND to build the project "
         "with a custom command line.";
       /* clang-format on */
       this->SetError(ostr.str());

Source/CTest/cmCTestSubmitCommand.cxx

@@ -23,8 +23,6 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
   const char* ctestTriggerSite =
     this->Makefile->GetDefinition("CTEST_TRIGGER_SITE");
   bool ctestDropSiteCDash = this->Makefile->IsOn("CTEST_DROP_SITE_CDASH");
-  const char* ctestProjectName =
-    this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
   if (!ctestDropMethod) {
     ctestDropMethod = "http";
   }
@@ -37,8 +35,6 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     // error: CDash requires CTEST_DROP_LOCATION definition
     // in CTestConfig.cmake
   }
-  this->CTest->SetCTestConfiguration("ProjectName", ctestProjectName,
-                                     this->Quiet);
   this->CTest->SetCTestConfiguration("DropMethod", ctestDropMethod,
                                      this->Quiet);
   this->CTest->SetCTestConfiguration("DropSite", ctestDropSite, this->Quiet);

Source/CTest/cmCTestSubmitHandler.cxx

@@ -1084,8 +1084,12 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
   std::string dropMethod;
   std::string url;
   this->ConstructCDashURL(dropMethod, url);
-  std::string::size_type pos = url.find("submit.php?");
-  url = url.substr(0, pos + 10);
+  std::string fields;
+  std::string::size_type pos = url.find('?');
+  if (pos != std::string::npos) {
+    fields = url.substr(pos + 1);
+    url = url.substr(0, pos);
+  }
   if (!(dropMethod == "http" || dropMethod == "https")) {
     cmCTestLog(this->CTest, ERROR_MESSAGE,
                "Only http and https are supported for CDASH_UPLOAD\n");
@@ -1133,8 +1137,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
   const char* subproject = cm->GetState()->GetGlobalProperty("SubProject");
   // TODO: Encode values for a URL instead of trusting caller.
   std::ostringstream str;
-  str << "project="
-      << curl.Escape(this->CTest->GetCTestConfiguration("ProjectName")) << "&";
   if (subproject) {
     str << "subproject=" << curl.Escape(subproject) << "&";
   }
@@ -1152,7 +1154,10 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
       << "endtime=" << timeNow << "&"
       << "datafilesmd5[0]=" << md5sum << "&"
       << "type=" << curl.Escape(typeString);
-  std::string fields = str.str();
+  if (!fields.empty()) {
+    fields += '&';
+  }
+  fields += str.str();
   cmCTestOptionalLog(this->CTest, DEBUG,
                      "fields: " << fields << "\nurl:" << url
                                 << "\nfile: " << file << "\n",

Source/cmCTest.cxx

@@ -649,16 +649,6 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command)
       command->SetError(m);
       return false;
     }
-  } else {
-    cmCTestOptionalLog(this, WARNING,
-                       "Cannot locate CTest configuration: in BuildDirectory: "
-                         << bld_dir_fname << std::endl,
-                       command->ShouldBeQuiet());
-    cmCTestOptionalLog(
-      this, WARNING,
-      "Cannot locate CTest configuration: in SourceDirectory: "
-        << src_dir_fname << std::endl,
-      command->ShouldBeQuiet());
   }
 
   this->SetCTestConfigurationFromCMakeVariable(mf, "NightlyStartTime",

Tests/CTestBuildCommandProjectInSubdir/CTestBuildCommandProjectInSubdir.cmake.in

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8.10)
 set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/VSProjectInSubdir")
 set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestBuildCommandProjectInSubdir/Nested")
 set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
-set(CTEST_PROJECT_NAME "VSProjectInSubdir")
 set(CTEST_BUILD_CONFIGURATION "@CTestTest_CONFIG@")
 
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})

Tests/CTestConfig/script.cmake.in

@@ -1,7 +1,6 @@
 set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
 set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
-set(CTEST_PROJECT_NAME "CTestConfig")
 set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestConfig")
 set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestConfig/@cfg@-script")
 

Tests/CTestCoverageCollectGCOV/test.cmake.in

@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 2.8.12)
-set(CTEST_PROJECT_NAME "TestProject")
 set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestCoverageCollectGCOV/TestProject")
 set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestCoverageCollectGCOV/TestProject")
 set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")

Tests/CTestTestBadExe/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestBadExe")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestBadGenerator/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestBadGenerator")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestCostSerial/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestCostSerial")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestCrash/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestCrash")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestCycle/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestCycle")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestDepends/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestDepends")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestFailure/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestFailure")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestFdSetSize/CTestConfig.cmake

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestFdSetSize")

Tests/CTestTestLaunchers/launcher_compiler_test_project/CTestConfig.cmake

@@ -1,5 +1,4 @@
 set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestLaunchers/launcher_custom_command_test_project/CTestConfig.cmake

@@ -1,5 +1,4 @@
 set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestLaunchers/launcher_linker_test_project/CTestConfig.cmake

@@ -1,5 +1,4 @@
 set(CTEST_USE_LAUNCHERS 1)
-set(CTEST_PROJECT_NAME "CTestTestLaunchers")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestParallel/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestParallel")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestResourceLock/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestResourceLock")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestScheduler/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestScheduler")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestSkipReturnCode/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestSkipReturnCode")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestStopTime/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestStopTime")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestSubdir/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestSubdir")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestTimeout/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestTimeout")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestUpload/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestUpload")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set (CTEST_DROP_METHOD "http")

Tests/CTestTestVerboseOutput/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestVerboseOutput")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestTestZeroTimeout/CTestConfig.cmake

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestTestZeroTimeout")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/CTestUpdateCommon.cmake

@@ -130,7 +130,6 @@ function(create_content dir)
   # An example CTest project configuration file.
   file(WRITE ${TOP}/${dir}/CTestConfig.cmake
     "# CTest Configuration File
-set(CTEST_PROJECT_NAME TestProject)
 set(CTEST_NIGHTLY_START_TIME \"21:00:00 EDT\")
 ")
 

Tests/RunCMake/CTestTimeoutAfterMatch/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "TimeoutAfterMatch@CASE_NAME@")

Tests/RunCMake/RunCTest.cmake

@@ -3,8 +3,12 @@ include(RunCMake)
 function(run_ctest CASE_NAME)
   configure_file(${RunCMake_SOURCE_DIR}/test.cmake.in
                  ${RunCMake_BINARY_DIR}/${CASE_NAME}/test.cmake @ONLY)
-  configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
-                 ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+  if(EXISTS "${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in")
+    configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
+                   ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake @ONLY)
+  else()
+    file(REMOVE ${RunCMake_BINARY_DIR}/${CASE_NAME}/CTestConfig.cmake)
+  endif()
   configure_file(${RunCMake_SOURCE_DIR}/CMakeLists.txt.in
                  ${RunCMake_BINARY_DIR}/${CASE_NAME}/CMakeLists.txt @ONLY)
   run_cmake_command(${CASE_NAME} ${CMAKE_CTEST_COMMAND}

Tests/RunCMake/WorkingDirectory/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestWorkingDir.@CASE_NAME@")

Tests/RunCMake/ctest_build/BuildQuiet-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_build/BuildQuiet
    Build directory: .*/Tests/RunCMake/ctest_build/BuildQuiet-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_build/BuildQuiet/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
    Use Experimental tag: [0-9-]+

Tests/RunCMake/ctest_build/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestBuild@CASE_NAME@")

Tests/RunCMake/ctest_cmake_error/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestCoverage@CASE_NAME@")

Tests/RunCMake/ctest_configure/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestConfigure@CASE_NAME@")

Tests/RunCMake/ctest_configure/ConfigureQuiet-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet
    Build directory: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_configure/ConfigureQuiet/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
    Use Experimental tag: [0-9-]+

Tests/RunCMake/ctest_coverage/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestCoverage@CASE_NAME@")

Tests/RunCMake/ctest_disabled_test/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "@CASE_NAME@")

Tests/RunCMake/ctest_fixtures/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTestFixtures.@CASE_NAME@")

Tests/RunCMake/ctest_labels_for_subprojects/CTestConfig.cmake.in

@@ -1,2 +1 @@
-set(CTEST_PROJECT_NAME "CTestLabelsForSubprojects@CASE_NAME@")
 @CTEST_EXTRA_CONFIG@

Tests/RunCMake/ctest_memcheck/CTestConfig.cmake.in

@@ -1,4 +1,3 @@
-set (CTEST_PROJECT_NAME "CTestTestMemcheck@CASE_NAME@")
 set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set (CTEST_DART_SERVER_VERSION "2")
 set(CTEST_DROP_METHOD "http")

Tests/RunCMake/ctest_skipped_test/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "@CASE_NAME@")

Tests/RunCMake/ctest_start/AppendDifferentModel-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_start/AppendDifferentModel
    Build directory: .*/Tests/RunCMake/ctest_start/AppendDifferentModel-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendDifferentModel/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - ContinuousTrack

Tests/RunCMake/ctest_start/AppendDifferentTrack-stdout.txt

@@ -2,7 +2,6 @@ Run dashboard with to-be-determined model
    Source directory: .*/Tests/RunCMake/ctest_start/AppendDifferentTrack
    Build directory: .*/Tests/RunCMake/ctest_start/AppendDifferentTrack-build
    Track: ExperimentalDifferent
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendDifferentTrack/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - ExperimentalDifferent

Tests/RunCMake/ctest_start/AppendNoMatchingTrack-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Continuous
    Source directory: .*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack
    Build directory: .*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendNoMatchingTrack/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - SomeWeirdTrackName

Tests/RunCMake/ctest_start/AppendNoModel-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with to-be-determined model
    Source directory: .*/Tests/RunCMake/ctest_start/AppendNoModel
    Build directory: .*/Tests/RunCMake/ctest_start/AppendNoModel-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendNoModel/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - ContinuousTrack

Tests/RunCMake/ctest_start/AppendOldContinuous-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Continuous
    Source directory: .*/Tests/RunCMake/ctest_start/AppendOldContinuous
    Build directory: .*/Tests/RunCMake/ctest_start/AppendOldContinuous-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendOldContinuous/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - ContinuousTrack

Tests/RunCMake/ctest_start/AppendOldNoModel-stdout.txt

@@ -1,6 +1,5 @@
 Run dashboard with to-be-determined model
    Source directory: .*/Tests/RunCMake/ctest_start/AppendOldNoModel
    Build directory: .*/Tests/RunCMake/ctest_start/AppendOldNoModel-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendOldNoModel/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name

Tests/RunCMake/ctest_start/AppendSameModel-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Continuous
    Source directory: .*/Tests/RunCMake/ctest_start/AppendSameModel
    Build directory: .*/Tests/RunCMake/ctest_start/AppendSameModel-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/AppendSameModel/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
   Use existing tag: 19551112-2204 - ContinuousTrack

Tests/RunCMake/ctest_start/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestStart@CASE_NAME@")

Tests/RunCMake/ctest_start/ConfigInBuild-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_start/ConfigInBuild
    Build directory: .*/Tests/RunCMake/ctest_start/ConfigInBuild-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/ConfigInBuild-build/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
    Use Experimental tag: [0-9-]+

Tests/RunCMake/ctest_start/ConfigInSource-stdout.txt

@@ -1,7 +1,6 @@
 Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_start/ConfigInSource
    Build directory: .*/Tests/RunCMake/ctest_start/ConfigInSource-build
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/ConfigInSource/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
    Use Experimental tag: [0-9-]+

Tests/RunCMake/ctest_start/NoAppendDifferentTrack-stdout.txt

@@ -2,7 +2,6 @@ Run dashboard with model Experimental
    Source directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack
    Build directory: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack-build
    Track: ExperimentalDifferent
-   Reading ctest configuration file: .*/Tests/RunCMake/ctest_start/NoAppendDifferentTrack/CTestConfig.cmake
    Site: test-site
    Build name: test-build-name
    Use ExperimentalDifferent tag: [0-9-]+

Tests/RunCMake/ctest_start/RunCMakeTest.cmake

@@ -48,8 +48,6 @@ function(run_ConfigInBuild)
   set(RunCMake_TEST_NO_CLEAN 1)
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-  configure_file(${RunCMake_SOURCE_DIR}/CTestConfig.cmake.in
-                 ${RunCMake_BINARY_DIR}/ConfigInBuild-build/CTestConfig.cmake @ONLY)
   run_ctest_start(ConfigInBuild Experimental)
 endfunction()
 run_ConfigInBuild()

Tests/RunCMake/ctest_submit/CTestConfig.cmake.in

@@ -1,4 +1,3 @@
-set(CTEST_PROJECT_NAME "CTestSubmit@CASE_NAME@")
 
 # Intentionally leave out other upload-related CTestConfig.cmake settings
 # so that any ctest_submit calls fail with an error message.

Tests/RunCMake/ctest_test/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestTest@CASE_NAME@")

Tests/RunCMake/ctest_upload/CTestConfig.cmake.in

@@ -1 +0,0 @@
-set(CTEST_PROJECT_NAME "CTestUpload@CASE_NAME@")

Tests/Tutorial/Step7/CTestConfig.cmake

@@ -1 +0,0 @@
-set (CTEST_PROJECT_NAME "Tutorial")