mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

CTest: Throw error if resource spec is invalid

Browse Source
This commit is contained in:
Kyle Edwards
2024-02-07 11:39:02 -05:00
parent b8ed46eade
commit b9bfd411cb
19 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@@ -83,7 +83,7 @@ cmCTestMultiProcessHandler::cmCTestMultiProcessHandler()
cmCTestMultiProcessHandler::~cmCTestMultiProcessHandler() = default;
// Set the tests
void cmCTestMultiProcessHandler::SetTests(TestMap tests,
bool cmCTestMultiProcessHandler::SetTests(TestMap tests,
PropertiesMap properties)
{
this->PendingTests = std::move(tests);
@@ -95,10 +95,11 @@ void cmCTestMultiProcessHandler::SetTests(TestMap tests,
this->HasInvalidGeneratedResourceSpec =
!this->CheckGeneratedResourceSpec();
if (this->HasCycles || this->HasInvalidGeneratedResourceSpec) {
return;
return false;
}
this->CreateTestCostList();
}
return true;
}
// Set the max number of tests that can be run at the same time.

2
Source/CTest/cmCTestMultiProcessHandler.h
View File

@@ -61,7 +61,7 @@ public:
cmCTestMultiProcessHandler();
virtual ~cmCTestMultiProcessHandler();
// Set the tests
void SetTests(TestMap tests, PropertiesMap properties);
bool SetTests(TestMap tests, PropertiesMap properties);
// Set the max number of tests that can be run at the same time.
void SetParallelLevel(size_t);
void SetTestLoad(unsigned long load);

4
Source/CTest/cmCTestTestHandler.cxx
View File

@@ -1410,7 +1410,9 @@ bool cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
properties[p.Index] = &p;
}
parallel->SetResourceSpecFile(this->ResourceSpecFile);
parallel->SetTests(std::move(tests), std::move(properties));
if (!parallel->SetTests(std::move(tests), std::move(properties))) {
return false;
}
parallel->SetPassFailVectors(&passed, &failed);
this->TestResults.clear();
parallel->SetTestResults(&this->TestResults);

10
Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake
View File

@@ -167,6 +167,16 @@ function(verify_ctest_resources)
endif()
endfunction()
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/invalid-build")
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "add_test(true \"${CMAKE_COMMAND}\" -E true)\n")
run_cmake_command(invalid-nofile-ctest ${CMAKE_CTEST_COMMAND} --resource-spec-file "${RunCMake_BINARY_DIR}/noexist.json")
run_cmake_command(invalid-not-json-ctest ${CMAKE_CTEST_COMMAND} --resource-spec-file "${RunCMake_SOURCE_DIR}/invalid.json")
unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_BINARY_DIR)
run_ctest_resource(lotsoftests 10 1 0)
run_ctest_resource(checkfree1 2 0 1)
run_ctest_resource(checkfree2 1 0 0)

6
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-circular-ctest-s-stderr.txt
View File

@@ -1,3 +1,5 @@
^Error: a cycle exists in the test dependency graph for the test "GenerateSpecFile"\.
Please fix the cycle and run ctest again.
No tests were found!!!$
Please fix the cycle and run ctest again\.
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-circular-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-circular-no-required-fixtures-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^All tests that have RESOURCE_GROUPS must include the resource spec generator fixture in their FIXTURES_REQUIRED
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-circular-no-required-fixtures-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-conflicting-spec-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^GENERATED_RESOURCE_SPEC_FILE test property cannot be used in conjunction with ResourceSpecFile option
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-conflicting-spec-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-multiple-generators-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^Only one test may define the GENERATED_RESOURCE_SPEC_FILE property
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-multiple-generators-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-multiple-setup-fixtures-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^Test that defines GENERATED_RESOURCE_SPEC_FILE must have exactly one FIXTURES_SETUP
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-multiple-setup-fixtures-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-no-required-fixture-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^All tests that have RESOURCE_GROUPS must include the resource spec generator fixture in their FIXTURES_REQUIRED
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-no-required-fixture-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-no-setup-fixture-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^Test that defines GENERATED_RESOURCE_SPEC_FILE must have exactly one FIXTURES_SETUP
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-no-setup-fixture-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

4
Tests/RunCMake/CTestResourceAllocation/dynamic-resource-relative-path-ctest-s-stderr.txt
View File

@@ -1,2 +1,4 @@
^GENERATED_RESOURCE_SPEC_FILE must be an absolute path
No tests were found!!!$
CMake Error at [^
]*/Tests/RunCMake/CTestResourceAllocation/dynamic-resource-relative-path-ctest-s/test\.cmake:[0-9]+ \(message\):
Tests did not pass$

1
Tests/RunCMake/CTestResourceAllocation/invalid-nofile-ctest-result.txt Normal file
View File

@@ -0,0 +1 @@
8

8
Tests/RunCMake/CTestResourceAllocation/invalid-nofile-ctest-stderr.txt Normal file
View File

@@ -0,0 +1,8 @@
^Could not read/parse resource spec file [^
]*/Tests/RunCMake/CTestResourceAllocation/noexist\.json:[ ]
File not found: [^
]*/Tests/RunCMake/CTestResourceAllocation/noexist.json
Errors while running CTest
Output from these tests are in: [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid-build/Testing/Temporary/LastTest\.log
Use "--rerun-failed --output-on-failure" to re-run the failed cases verbosely\.$

1
Tests/RunCMake/CTestResourceAllocation/invalid-not-json-ctest-result.txt Normal file
View File

@@ -0,0 +1 @@
8

15
Tests/RunCMake/CTestResourceAllocation/invalid-not-json-ctest-stderr.txt Normal file
View File

@@ -0,0 +1,15 @@
^Could not read/parse resource spec file [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json:[ ]
JSON Parse Error: [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid\.json:
\* Line 1, Column 1
Syntax error: value, object or array expected\.
(\* Line 1, Column 2
Extra non-whitespace after JSON value\.
|\* Line 1, Column 1
A valid JSON document must be either an array or an object value\.
)
Errors while running CTest
Output from these tests are in: [^
]*/Tests/RunCMake/CTestResourceAllocation/invalid-build/Testing/Temporary/LastTest\.log
Use "--rerun-failed --output-on-failure" to re-run the failed cases verbosely\.$

1
Tests/RunCMake/CTestResourceAllocation/invalid.json Normal file
View File

@@ -0,0 +1 @@
This is not a valid JSON file!

5
Tests/RunCMake/ctest_fixtures/cyclicCleanup-stderr.txt
View File

@@ -1,3 +1,2 @@
Error: a cycle exists in the test dependency graph for the test "cyclicCleanup".
Please fix the cycle and run ctest again.
No tests were found!!!
^Error: a cycle exists in the test dependency graph for the test "cyclicCleanup"\.
Please fix the cycle and run ctest again\.$

5
Tests/RunCMake/ctest_fixtures/cyclicSetup-stderr.txt
View File

@@ -1,3 +1,2 @@
Error: a cycle exists in the test dependency graph for the test "cyclicSetup".
Please fix the cycle and run ctest again.
No tests were found!!!$
^Error: a cycle exists in the test dependency graph for the test "cyclicSetup"\.
Please fix the cycle and run ctest again\.$