mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-09 23:59:53 -05:00
ctest: Remove outdated optimization of tests running ctest itself
In commit2c2291bbe0(ENH: add new feature to ctest so that it can cmake, build and run a test executable, 2004-01-07, v2.4.0~3483) ctest was taught to recognize tests that run ctest itself and run them internally instead of spawning a new process. This optimization was removed by commitb9daa192af(ENH: Refactored CTest test execution code into an object, 2009-08-19, v2.8.0~276) `cmCTestRunTest` replaced `cmCTestTestHandler::ProcessOneTest`, which was eventually removed by commit5a5cc52230(Fixed conversion warning on 64 bit machines, 2009-08-31, v2.8.0~241). Since then the optimization was only left in `--build-and-test` mode, likely by accident, where it makes little difference. Remove it to simplify the code. Also drop the `--force-new-ctest-process` option, originally added by commit9255e40d81(ENH: Add a way to force ctest to be a new process, 2004-05-10, v2.4.0~3101), since it no longer does anything.
This commit is contained in:
@@ -421,11 +421,8 @@ Run Tests
|
||||
|
||||
.. option:: --force-new-ctest-process
|
||||
|
||||
Run child CTest instances as new processes.
|
||||
|
||||
By default CTest will run child CTest instances within the same
|
||||
process. If this behavior is not desired, this argument will
|
||||
enforce new processes for child CTest processes.
|
||||
Ignored. This option once disabled a now-removed optimization
|
||||
for tests running ``ctest`` itself.
|
||||
|
||||
.. option:: --schedule-random
|
||||
|
||||
|
||||
@@ -29,15 +29,6 @@ const char* cmCTestBuildAndTest::GetOutput()
|
||||
return this->Output.c_str();
|
||||
}
|
||||
|
||||
int cmCTestBuildAndTest::Run()
|
||||
{
|
||||
this->Output.clear();
|
||||
cmSystemTools::ResetErrorOccurredFlag();
|
||||
int retv = this->RunCMakeAndTest();
|
||||
cmSystemTools::ResetErrorOccurredFlag();
|
||||
return retv;
|
||||
}
|
||||
|
||||
int cmCTestBuildAndTest::RunCMake(std::ostringstream& out,
|
||||
std::string& cmakeOutString, cmake* cm)
|
||||
{
|
||||
@@ -131,7 +122,7 @@ public:
|
||||
const cmCTestBuildAndTestCaptureRAII&) = delete;
|
||||
};
|
||||
|
||||
int cmCTestBuildAndTest::RunCMakeAndTest()
|
||||
int cmCTestBuildAndTest::Run()
|
||||
{
|
||||
// if the generator and make program are not specified then it is an error
|
||||
if (this->BuildGenerator.empty()) {
|
||||
|
||||
@@ -35,8 +35,6 @@ public:
|
||||
private:
|
||||
cmCTest* CTest;
|
||||
|
||||
//! Run CMake and build a test and then run it as a single test.
|
||||
int RunCMakeAndTest();
|
||||
int RunCMake(std::ostringstream& out, std::string& cmakeOutString,
|
||||
cmake* cm);
|
||||
|
||||
|
||||
+16
-75
@@ -54,7 +54,6 @@
|
||||
#include "cmCTestUpdateHandler.h"
|
||||
#include "cmCTestUploadHandler.h"
|
||||
#include "cmCommandLineArgument.h"
|
||||
#include "cmDynamicLoader.h"
|
||||
#include "cmExecutionStatus.h"
|
||||
#include "cmGeneratedFileStream.h"
|
||||
#include "cmGlobalGenerator.h"
|
||||
@@ -122,8 +121,6 @@ struct cmCTest::Private
|
||||
|
||||
bool FlushTestProgressLine = false;
|
||||
|
||||
bool ForceNewCTestProcess = false;
|
||||
|
||||
bool RunConfigurationScript = false;
|
||||
|
||||
// these are helper classes
|
||||
@@ -206,10 +203,6 @@ struct cmCTest::Private
|
||||
bool CompressXMLFiles = false;
|
||||
bool CompressTestOutput = true;
|
||||
|
||||
// By default we write output to the process output streams.
|
||||
std::ostream* StreamOut = &std::cout;
|
||||
std::ostream* StreamErr = &std::cerr;
|
||||
|
||||
bool SuppressUpdatingCTestConfiguration = false;
|
||||
|
||||
bool Debug = false;
|
||||
@@ -1234,43 +1227,8 @@ bool cmCTest::RunMakeCommand(const std::string& command, std::string& output,
|
||||
}
|
||||
|
||||
bool cmCTest::RunTest(std::vector<std::string> const& argv,
|
||||
std::string* output, int* retVal, cmDuration testTimeOut)
|
||||
std::string* output, int* retVal, cmDuration timeout)
|
||||
{
|
||||
cmDuration timeout = cmCTest::MaxDuration();
|
||||
if (testTimeOut > cmDuration::zero()) {
|
||||
timeout = testTimeOut;
|
||||
}
|
||||
|
||||
if (cmSystemTools::SameFile(argv[0], cmSystemTools::GetCTestCommand()) &&
|
||||
!this->Impl->ForceNewCTestProcess) {
|
||||
cmCTest inst;
|
||||
inst.Impl->ConfigType = this->Impl->ConfigType;
|
||||
inst.Impl->TimeOut = timeout;
|
||||
|
||||
// Capture output of the child ctest.
|
||||
std::ostringstream oss;
|
||||
inst.SetStreams(&oss, &oss);
|
||||
|
||||
std::vector<std::string> args;
|
||||
for (auto const& i : argv) {
|
||||
// make sure we pass the timeout in for any build and test
|
||||
// invocations. Since --build-generator is required this is a
|
||||
// good place to check for it, and to add the arguments in
|
||||
if (i == "--build-generator" && timeout != cmCTest::MaxDuration() &&
|
||||
timeout > cmDuration::zero()) {
|
||||
args.emplace_back("--test-timeout");
|
||||
args.push_back(std::to_string(cmDurationTo<unsigned int>(timeout)));
|
||||
}
|
||||
args.emplace_back(i);
|
||||
}
|
||||
|
||||
*retVal = inst.Run(args, output);
|
||||
if (output) {
|
||||
*output += oss.str();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
std::vector<char> tempOutput;
|
||||
if (output) {
|
||||
output->clear();
|
||||
@@ -2224,7 +2182,7 @@ bool cmCTest::SetArgsFromPreset(const std::string& presetName,
|
||||
}
|
||||
|
||||
// the main entry point of ctest, called from main
|
||||
int cmCTest::Run(std::vector<std::string>& args, std::string* output)
|
||||
int cmCTest::Run(std::vector<std::string> const& args)
|
||||
{
|
||||
const char* ctestExec = "ctest";
|
||||
bool cmakeAndTest = false;
|
||||
@@ -2829,8 +2787,8 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
|
||||
} },
|
||||
CommandArgument{ "--force-new-ctest-process",
|
||||
CommandArgument::Values::Zero,
|
||||
[this](std::string const&) -> bool {
|
||||
this->Impl->ForceNewCTestProcess = true;
|
||||
[](std::string const&) -> bool {
|
||||
// Silently ignore now-removed option.
|
||||
return true;
|
||||
} },
|
||||
CommandArgument{ "-W", CommandArgument::Values::One, dashW },
|
||||
@@ -3035,7 +2993,7 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
|
||||
// now what should cmake do? if --build-and-test was specified then
|
||||
// we run the build and test handler and return
|
||||
if (cmakeAndTest) {
|
||||
return this->RunCMakeAndTest(output);
|
||||
return this->RunCMakeAndTest();
|
||||
}
|
||||
|
||||
if (executeTests) {
|
||||
@@ -3106,18 +3064,10 @@ int cmCTest::ExecuteTests()
|
||||
return res;
|
||||
}
|
||||
|
||||
int cmCTest::RunCMakeAndTest(std::string* output)
|
||||
int cmCTest::RunCMakeAndTest()
|
||||
{
|
||||
this->Impl->Verbose = true;
|
||||
int retv = this->Impl->BuildAndTest.Run();
|
||||
*output = this->Impl->BuildAndTest.GetOutput();
|
||||
#ifndef CMAKE_BOOTSTRAP
|
||||
cmDynamicLoader::FlushCache();
|
||||
#endif
|
||||
if (retv != 0) {
|
||||
cmCTestLog(this, DEBUG,
|
||||
"build and test failing returning: " << retv << std::endl);
|
||||
}
|
||||
std::cout << this->Impl->BuildAndTest.GetOutput();
|
||||
return retv;
|
||||
}
|
||||
|
||||
@@ -3504,12 +3454,6 @@ bool cmCTest::GetExtraVerbose() const
|
||||
return this->Impl->ExtraVerbose;
|
||||
}
|
||||
|
||||
void cmCTest::SetStreams(std::ostream* out, std::ostream* err)
|
||||
{
|
||||
this->Impl->StreamOut = out;
|
||||
this->Impl->StreamErr = err;
|
||||
}
|
||||
|
||||
bool cmCTest::GetLabelSummary() const
|
||||
{
|
||||
return this->Impl->LabelSummary;
|
||||
@@ -3871,15 +3815,12 @@ void cmCTest::Log(LogType logType, std::string msg, bool suppress)
|
||||
}
|
||||
}
|
||||
if (!this->Impl->Quiet) {
|
||||
std::ostream& out = *this->Impl->StreamOut;
|
||||
std::ostream& err = *this->Impl->StreamErr;
|
||||
|
||||
if (logType == HANDLER_TEST_PROGRESS_OUTPUT) {
|
||||
if (this->Impl->TestProgressOutput) {
|
||||
if (this->Impl->FlushTestProgressLine) {
|
||||
printf("\r");
|
||||
this->Impl->FlushTestProgressLine = false;
|
||||
out.flush();
|
||||
std::cout.flush();
|
||||
}
|
||||
|
||||
if (msg.find('\n') != std::string::npos) {
|
||||
@@ -3887,11 +3828,11 @@ void cmCTest::Log(LogType logType, std::string msg, bool suppress)
|
||||
msg.erase(std::remove(msg.begin(), msg.end(), '\n'), msg.end());
|
||||
}
|
||||
|
||||
out << msg;
|
||||
std::cout << msg;
|
||||
#ifndef _WIN32
|
||||
printf("\x1B[K"); // move caret to end
|
||||
#endif
|
||||
out.flush();
|
||||
std::cout.flush();
|
||||
return;
|
||||
}
|
||||
logType = HANDLER_OUTPUT;
|
||||
@@ -3900,29 +3841,29 @@ void cmCTest::Log(LogType logType, std::string msg, bool suppress)
|
||||
switch (logType) {
|
||||
case DEBUG:
|
||||
if (this->Impl->Debug) {
|
||||
out << msg << std::flush;
|
||||
std::cout << msg << std::flush;
|
||||
}
|
||||
break;
|
||||
case OUTPUT:
|
||||
case HANDLER_OUTPUT:
|
||||
if (this->Impl->Debug || this->Impl->Verbose) {
|
||||
out << msg << std::flush;
|
||||
std::cout << msg << std::flush;
|
||||
}
|
||||
break;
|
||||
case HANDLER_VERBOSE_OUTPUT:
|
||||
if (this->Impl->Debug || this->Impl->ExtraVerbose) {
|
||||
out << msg << std::flush;
|
||||
std::cout << msg << std::flush;
|
||||
}
|
||||
break;
|
||||
case WARNING:
|
||||
err << msg << std::flush;
|
||||
std::cerr << msg << std::flush;
|
||||
break;
|
||||
case ERROR_MESSAGE:
|
||||
err << msg << std::flush;
|
||||
std::cerr << msg << std::flush;
|
||||
cmSystemTools::SetErrorOccurred();
|
||||
break;
|
||||
default:
|
||||
out << msg << std::flush;
|
||||
std::cout << msg << std::flush;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-6
@@ -66,7 +66,7 @@ public:
|
||||
Part GetPartFromName(const std::string& name);
|
||||
|
||||
/** Process Command line arguments */
|
||||
int Run(std::vector<std::string>&, std::string* output = nullptr);
|
||||
int Run(std::vector<std::string> const& args);
|
||||
|
||||
/**
|
||||
* Initialize and finalize testing
|
||||
@@ -301,7 +301,7 @@ public:
|
||||
* In --build-and-test, run the --test-command.
|
||||
*/
|
||||
bool RunTest(std::vector<std::string> const& args, std::string* output,
|
||||
int* retVal, cmDuration testTimeOut);
|
||||
int* retVal, cmDuration timeout);
|
||||
|
||||
/**
|
||||
* Get the handler object
|
||||
@@ -421,9 +421,6 @@ public:
|
||||
bool GetVerbose() const;
|
||||
bool GetExtraVerbose() const;
|
||||
|
||||
/** Direct process output to given streams. */
|
||||
void SetStreams(std::ostream* out, std::ostream* err);
|
||||
|
||||
void AddSiteProperties(cmXMLWriter& xml);
|
||||
|
||||
bool GetLabelSummary() const;
|
||||
@@ -512,7 +509,7 @@ private:
|
||||
static bool CheckArgument(const std::string& arg, cm::string_view varg1,
|
||||
const char* varg2 = nullptr);
|
||||
|
||||
int RunCMakeAndTest(std::string* output);
|
||||
int RunCMakeAndTest();
|
||||
int ExecuteTests();
|
||||
|
||||
/** return true iff change directory was successful */
|
||||
|
||||
@@ -2978,7 +2978,6 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
|
||||
}
|
||||
cmCustomCommandLine singleLine;
|
||||
singleLine.push_back(cmSystemTools::GetCTestCommand());
|
||||
singleLine.push_back("--force-new-ctest-process");
|
||||
cmList args(mf->GetDefinition("CMAKE_CTEST_ARGUMENTS"));
|
||||
for (auto const& arg : args) {
|
||||
singleLine.push_back(arg);
|
||||
|
||||
+1
-7
@@ -147,8 +147,6 @@ const cmDocumentationEntry cmDocumentationOptions[] = {
|
||||
{ "--overwrite", "Overwrite CTest configuration option." },
|
||||
{ "--extra-submit <file>[;<file>]", "Submit extra files to the dashboard." },
|
||||
{ "--http-header <header>", "Append HTTP header when submitting" },
|
||||
{ "--force-new-ctest-process",
|
||||
"Run child CTest instances as new processes" },
|
||||
{ "--schedule-random", "Use a random order for scheduling tests" },
|
||||
{ "--submit-index",
|
||||
"Submit individual dashboard tests with specific index" },
|
||||
@@ -228,9 +226,5 @@ int main(int argc, char const* const* argv)
|
||||
args.emplace_back(argv[i]);
|
||||
}
|
||||
// run ctest
|
||||
std::string output;
|
||||
int res = inst.Run(args, &output);
|
||||
cmCTestLog(&inst, OUTPUT, output);
|
||||
|
||||
return res;
|
||||
return inst.Run(args);
|
||||
}
|
||||
|
||||
@@ -663,7 +663,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project ExternalDataTest
|
||||
--build-noclean
|
||||
--force-new-ctest-process
|
||||
--build-options
|
||||
-DMAKE_SUPPORTS_SPACES=${MAKE_SUPPORTS_SPACES}
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} -V
|
||||
@@ -1383,7 +1382,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project EnvironmentProj
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Environment"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Environment")
|
||||
@@ -1422,7 +1420,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project Qt4Targets
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Targets"
|
||||
--force-new-ctest-process
|
||||
--build-options
|
||||
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
@@ -1437,7 +1434,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project Qt4And5Automoc
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocForward"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocForward")
|
||||
@@ -1448,7 +1444,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project Qt4And5Automoc
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse"
|
||||
--force-new-ctest-process
|
||||
--build-options -DQT_REVERSE_FIND_ORDER=1
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
@@ -1645,7 +1640,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectTest
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/ExternalProject"
|
||||
--force-new-ctest-process
|
||||
--build-options ${ExternalProject_BUILD_OPTIONS}
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
@@ -1662,7 +1656,6 @@ if(BUILD_TESTING)
|
||||
"${CMake_BINARY_DIR}/Tests/ExternalProjectSubdir"
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectSubdir
|
||||
--force-new-ctest-process
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectSubdir")
|
||||
|
||||
@@ -1673,7 +1666,6 @@ if(BUILD_TESTING)
|
||||
"${CMake_BINARY_DIR}/Tests/ExternalProjectSourceSubdir"
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectSourceSubdir
|
||||
--force-new-ctest-process
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectSourceSubdir")
|
||||
|
||||
@@ -1684,7 +1676,6 @@ if(BUILD_TESTING)
|
||||
"${CMake_BINARY_DIR}/Tests/ExternalProjectSourceSubdirNotCMake"
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectSourceSubdirNotCMake
|
||||
--force-new-ctest-process
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectSourceSubdirNotCMake")
|
||||
|
||||
@@ -1695,7 +1686,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectLocalTest
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/ExternalProjectLocal"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectLocal")
|
||||
@@ -1710,7 +1700,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project ExternalProjectUpdateTest
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/ExternalProjectUpdate"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProjectUpdate")
|
||||
@@ -1766,7 +1755,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project superpro
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/InstallMode-${_mode}"
|
||||
--force-new-ctest-process
|
||||
--build-options
|
||||
${_maybe_BUILD_OPTIONS}
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${CMake_BINARY_DIR}/Tests/InstallMode-${_mode}/install"
|
||||
@@ -2363,7 +2351,6 @@ if(BUILD_TESTING)
|
||||
--build-generator "Green Hills MULTI"
|
||||
--build-project test
|
||||
--build-config $<CONFIGURATION>
|
||||
--force-new-ctest-process
|
||||
--build-options ${ghs_target_arch} ${ghs_toolset_name} ${ghs_toolset_root} ${ghs_target_platform}
|
||||
${ghs_os_root} ${ghs_os_dir} ${ghs_bsp_name} ${_ghs_build_opts} ${_ghs_toolset_extra}
|
||||
${_ghs_test_command}
|
||||
@@ -2577,7 +2564,6 @@ if(BUILD_TESTING)
|
||||
${build_generator_args}
|
||||
--build-project TestsWorkingDirectoryProj
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V -C \${CTEST_CONFIGURATION_TYPE}
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory")
|
||||
@@ -3032,7 +3018,6 @@ if(BUILD_TESTING)
|
||||
)
|
||||
|
||||
if(NOT BORLAND)
|
||||
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
|
||||
add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
|
||||
--output-on-failure -C "\${CTestTest_CONFIG}")
|
||||
endif()
|
||||
|
||||
@@ -11,7 +11,6 @@ if(GTK2_GTK_FOUND)
|
||||
--build-target gtk-all-libs
|
||||
--build-project gtk
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -25,7 +24,6 @@ if(GTK2_GTKMM_FOUND)
|
||||
--build-target gtkmm-all-libs
|
||||
--build-project gtkmm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -40,7 +38,6 @@ if(TARGET GTK2::glib)
|
||||
${build_generator_args}
|
||||
--build-project glib
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glib"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -53,7 +50,6 @@ if(TARGET GTK2::gobject)
|
||||
${build_generator_args}
|
||||
--build-project gobject
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gobject"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -66,7 +62,6 @@ if(TARGET GTK2::gio)
|
||||
${build_generator_args}
|
||||
--build-project gio
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gio"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -79,7 +74,6 @@ if(TARGET GTK2::gmodule)
|
||||
${build_generator_args}
|
||||
--build-project gmodule
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gmodule"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -92,7 +86,6 @@ if(TARGET GTK2::gthread)
|
||||
${build_generator_args}
|
||||
--build-project gthread
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gthread"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -105,7 +98,6 @@ if(TARGET GTK2::atk)
|
||||
${build_generator_args}
|
||||
--build-project atk
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atk"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -118,7 +110,6 @@ if(TARGET GTK2::gdk_pixbuf)
|
||||
${build_generator_args}
|
||||
--build-project gdk_pixbuf
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk_pixbuf"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -131,7 +122,6 @@ if(TARGET GTK2::cairo)
|
||||
${build_generator_args}
|
||||
--build-project cairo
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairo"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -144,7 +134,6 @@ if(TARGET GTK2::pango)
|
||||
${build_generator_args}
|
||||
--build-project pango
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pango"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -157,7 +146,6 @@ if(TARGET GTK2::pangocairo)
|
||||
${build_generator_args}
|
||||
--build-project pangocairo
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangocairo"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -170,7 +158,6 @@ if(TARGET GTK2::pangoxft)
|
||||
${build_generator_args}
|
||||
--build-project pangoxft
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoxft"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -183,7 +170,6 @@ if(TARGET GTK2::pangoft2)
|
||||
${build_generator_args}
|
||||
--build-project pangoft2
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoft2"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -196,7 +182,6 @@ if(TARGET GTK2::gdk)
|
||||
${build_generator_args}
|
||||
--build-project gdk
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -209,7 +194,6 @@ if(TARGET GTK2::gtk)
|
||||
${build_generator_args}
|
||||
--build-project gtk
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtk"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -222,7 +206,6 @@ if(TARGET GTK2::sigc++)
|
||||
${build_generator_args}
|
||||
--build-project sigc++
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/sigc++"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -235,7 +218,6 @@ if(TARGET GTK2::glibmm)
|
||||
${build_generator_args}
|
||||
--build-project glibmm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glibmm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -248,7 +230,6 @@ if(TARGET GTK2::giomm)
|
||||
${build_generator_args}
|
||||
--build-project giomm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/giomm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -261,7 +242,6 @@ if(TARGET GTK2::atkmm)
|
||||
${build_generator_args}
|
||||
--build-project atkmm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atkmm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -274,7 +254,6 @@ if(TARGET GTK2::cairomm)
|
||||
${build_generator_args}
|
||||
--build-project cairomm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairomm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -287,7 +266,6 @@ if(TARGET GTK2::pangomm)
|
||||
${build_generator_args}
|
||||
--build-project pangomm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangomm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -300,7 +278,6 @@ if(TARGET GTK2::gdkmm)
|
||||
${build_generator_args}
|
||||
--build-project gdkmm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/GTK2Targets/gdkmm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
@@ -314,7 +291,6 @@ if(TARGET GTK2::gtkmm)
|
||||
--build-target gtkmm-target
|
||||
--build-project gtkmm
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
|
||||
--force-new-ctest-process
|
||||
--test-command ${CMAKE_CTEST_COMMAND} -V
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -48,7 +48,6 @@ macro(ADD_AUTOGEN_TEST NAME)
|
||||
--build-project ${NAME}
|
||||
${Autogen_CTEST_OPTIONS}
|
||||
--build-exe-dir "${_BuildDir}"
|
||||
--force-new-ctest-process
|
||||
--build-options ${build_options} ${Autogen_BUILD_OPTIONS}
|
||||
${_TestCommand}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user