diff options
author | Brad King <brad.king@kitware.com> | 2024-04-01 15:35:19 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2024-04-01 16:22:29 (GMT) |
commit | 85745cce7aec38d9a7eaa83fb83ef3a7327fd6dc (patch) | |
tree | ef2cf0ad4e0889d596f9f3e474262aa00aa89b35 /Tests/CTestTestResourceLock | |
parent | 951f75f3b2e0a31957c0c492ff2d5c7c51716106 (diff) | |
download | CMake-85745cce7aec38d9a7eaa83fb83ef3a7327fd6dc.zip CMake-85745cce7aec38d9a7eaa83fb83ef3a7327fd6dc.tar.gz CMake-85745cce7aec38d9a7eaa83fb83ef3a7327fd6dc.tar.bz2 |
ctest: Restore enforcement of RESOURCE_LOCK test property
Refactoring in commit 5ff0b4ed57 (cmCTestMultiProcessHandler:
Consolidate test readiness checks, 2023-10-20, v3.29.0-rc1~378^2~4)
accidentally broke `RESOURCE_LOCK`. Fix it and replace the previous
test with one that would have caught this.
Fixes: #25843
Diffstat (limited to 'Tests/CTestTestResourceLock')
-rw-r--r-- | Tests/CTestTestResourceLock/CMakeLists.txt | 13 | ||||
-rw-r--r-- | Tests/CTestTestResourceLock/CTestConfig.cmake | 4 | ||||
-rw-r--r-- | Tests/CTestTestResourceLock/lockFile.c | 27 | ||||
-rw-r--r-- | Tests/CTestTestResourceLock/test.cmake.in | 21 |
4 files changed, 0 insertions, 65 deletions
diff --git a/Tests/CTestTestResourceLock/CMakeLists.txt b/Tests/CTestTestResourceLock/CMakeLists.txt deleted file mode 100644 index 683aba5..0000000 --- a/Tests/CTestTestResourceLock/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required (VERSION 3.5) -project(CTestTestResourceLock) -include(CTest) - -add_executable (LockFile lockFile.c) - -add_test (TestLockedFile1.1 LockFile locked1.txt) -add_test (TestLockedFile1.2 LockFile locked1.txt) -set_tests_properties(TestLockedFile1.1 TestLockedFile1.2 PROPERTIES RESOURCE_LOCK "locked1.txt") - -add_test (TestLockedFile2.1 LockFile locked2.txt) -add_test (TestLockedFile2.2 LockFile locked2.txt) -set_tests_properties(TestLockedFile2.1 TestLockedFile2.2 PROPERTIES RESOURCE_LOCK "locked2.txt") diff --git a/Tests/CTestTestResourceLock/CTestConfig.cmake b/Tests/CTestTestResourceLock/CTestConfig.cmake deleted file mode 100644 index bd265f9..0000000 --- a/Tests/CTestTestResourceLock/CTestConfig.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "open.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=PublicDashboard") diff --git a/Tests/CTestTestResourceLock/lockFile.c b/Tests/CTestTestResourceLock/lockFile.c deleted file mode 100644 index 8c023ef..0000000 --- a/Tests/CTestTestResourceLock/lockFile.c +++ /dev/null @@ -1,27 +0,0 @@ -#include <stdio.h> - -/* Disable deprecation warning for fopen */ -#pragma warning(disable : 4996) - -/*if run serially, works fine. - If run in parallel, someone will attempt to delete - a locked file, which will fail */ -int main(int argc, char** argv) -{ - FILE* file; - int i; - const char* fname; - if (argc >= 2) { - fname = argv[1]; - } else { - fname = "lockedFile.txt"; - } - file = fopen(fname, "w"); - - for (i = 0; i < 10000; i++) { - fprintf(file, "%s", "x"); - fflush(file); - } - fclose(file); - return remove(fname); -} diff --git a/Tests/CTestTestResourceLock/test.cmake.in b/Tests/CTestTestResourceLock/test.cmake.in deleted file mode 100644 index dab26fc..0000000 --- a/Tests/CTestTestResourceLock/test.cmake.in +++ /dev/null @@ -1,21 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -# Settings: -set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest") -set(CTEST_SITE "@SITE@") -set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-ResourceLock") - -set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestResourceLock") -set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestResourceLock") -set(CTEST_CVS_COMMAND "@CVSCOMMAND@") -set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") -set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@") -set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") -set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") -set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") -set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") - -CTEST_START(Experimental) -CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) -CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) -CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res PARALLEL_LEVEL 4) |