Commit 188c5c2a authored by Brad King's avatar Brad King 💬
Browse files

Merge branch 'revert-CTestTestfile-removal-again' into release-3.11

Merge-request: !1887
parents 218471a3 70c50aa2
......@@ -224,14 +224,7 @@ void cmLocalGenerator::TraceDependencies()
void cmLocalGenerator::GenerateTestFiles()
{
std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary();
file += "/";
file += "CTestTestfile.cmake";
if (!this->Makefile->IsOn("CMAKE_TESTING_ENABLED")) {
if (cmSystemTools::FileExists(file)) {
cmSystemTools::RemoveFile(file);
}
return;
}
......@@ -240,6 +233,10 @@ void cmLocalGenerator::GenerateTestFiles()
const std::string& config =
this->Makefile->GetConfigurations(configurationTypes, false);
std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary();
file += "/";
file += "CTestTestfile.cmake";
cmGeneratedFileStream fout(file.c_str());
fout.SetCopyIfDifferent(true);
......
set(f "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake")
if(NOT EXISTS "${f}")
set(RunCMake_TEST_FAILED "File does not exist:\n ${f}")
endif()
file(READ ${f} content)
if(NOT "${content}" MATCHES "^# Created manually")
set(RunCMake_TEST_FAILED "File:\n ${f}\nhas unexpected content:\n ${content}")
endif()
set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
include(CTest)
configure_file(CTestTestfile.cmake.in CTestTestfile.cmake)
......@@ -3,3 +3,5 @@ include(RunCMake)
set(RunCMake_TEST_OPTIONS -DNoProject=1)
run_cmake(BeforeProject)
unset(RunCMake_TEST_OPTIONS)
run_cmake(NotOn)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment