From 68d730bcff892ce304ef7ed6ce91bd67f9964666 Mon Sep 17 00:00:00 2001 From: makise-homura Date: Thu, 9 Jan 2025 23:58:32 +0300 Subject: [PATCH] Tests: switch off some RunCMake tests for broken libc on e2k Some old OS Elbrus installations (e.g. 6.0.1) have libc that tends to behave incorrectly in some rare cases. This prevents some tests from being run correctly: - RunCMake.Graphviz, test no_module_libs - RunCMake.Syntax, test EscapeCharsDisallowed These tests are now not run in case of such libc. --- Tests/RunCMake/CMakeLists.txt | 3 +++ Tests/RunCMake/Graphviz/RunCMakeTest.cmake | 4 +++- Tests/RunCMake/Syntax/RunCMakeTest.cmake | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index c4564b1ac9..bb559e272d 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -21,6 +21,9 @@ macro(add_RunCMake_test test) if(CMAKE_C_COMPILER_ID STREQUAL "LCC") list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1) endif() + if(DEFINED CMake_TEST_E2K_BROKEN_LIBC) + list(APPEND TEST_ARGS -DRunCMake_TEST_E2K_BROKEN_LIBC=${CMake_TEST_E2K_BROKEN_LIBC}) + endif() add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig} diff --git a/Tests/RunCMake/Graphviz/RunCMakeTest.cmake b/Tests/RunCMake/Graphviz/RunCMakeTest.cmake index c0cea1046a..c804cb1585 100644 --- a/Tests/RunCMake/Graphviz/RunCMakeTest.cmake +++ b/Tests/RunCMake/Graphviz/RunCMakeTest.cmake @@ -66,7 +66,9 @@ run_test(no_executables GRAPHVIZ_EXECUTABLES FALSE) run_test(no_static_libs GRAPHVIZ_STATIC_LIBS FALSE) run_test(no_shared_libs GRAPHVIZ_SHARED_LIBS FALSE) -run_test(no_module_libs GRAPHVIZ_MODULE_LIBS FALSE) +if(NOT RunCMake_TEST_E2K_BROKEN_LIBC) + run_test(no_module_libs GRAPHVIZ_MODULE_LIBS FALSE) +endif() run_test(no_interface_libs GRAPHVIZ_INTERFACE_LIBS FALSE) run_test(no_object_libs GRAPHVIZ_OBJECT_LIBS FALSE) diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index f56ac64753..9e6a14eae6 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -58,7 +58,9 @@ run_cmake(Escape2) run_cmake(EscapeCharsAllowed) run_cmake(NullAfterBackslash) run_cmake(NullTerminatedArgument) -include("${RunCMake_SOURCE_DIR}/EscapeCharsDisallowed.cmake") +if(NOT RunCMake_TEST_E2K_BROKEN_LIBC) + include("${RunCMake_SOURCE_DIR}/EscapeCharsDisallowed.cmake") +endif() run_cmake(ParenNoSpace0) run_cmake(ParenNoSpace1) run_cmake(ParenNoSpace2)