From 7b23fd6c1b91e32e20564864114ffd5b3732032a Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 8 Feb 2022 08:16:48 -0500 Subject: Tests: Run CTest.UpdateBZR tests only if explicitly enabled These tests have not been automatically enabled on current versions of `bzr` in a long time. The recent change to drop the `xmlplugins` heuristic caused the tests to start running on some machines, but they do not work everywhere. Disable the tests again pending further investigation. --- Tests/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 59cbbd9..8ebe5ed 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2603,15 +2603,9 @@ if(BUILD_TESTING) endif() # Test CTest Update with BZR - if(NOT DEFINED CMake_TEST_CTestUpdate_BZR OR CMake_TEST_CTestUpdate_BZR) + if(CMake_TEST_CTestUpdate_BZR) find_program(BZR_EXECUTABLE NAMES bzr) mark_as_advanced(BZR_EXECUTABLE) - endif() - if(NOT DEFINED CMake_TEST_CTestUpdate_BZR AND BZR_EXECUTABLE - AND (UNIX OR NOT "${BZR_EXECUTABLE}" MATCHES "cygwin")) - set(CMake_TEST_CTestUpdate_BZR 1) - endif() - if(CMake_TEST_CTestUpdate_BZR) if(NOT BZR_EXECUTABLE) message(FATAL_ERROR "CMake_TEST_CTestUpdate_BZR enabled but BZR_EXECUTABLE is not found.") endif() -- cgit v0.12