From b243c19986c0fb5837687a75b937d559f533310c Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 13 Jun 2024 09:11:52 -0400 Subject: Tests: Update expected results for Xcode 16 In `Tests/RunCMake/LinkerSelection`, Xcode 16 warns when building the AppleClassic case: ld: warning: -ld_classic is deprecated and will be removed in a future release Tolerate all build warnings. --- Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt | 2 +- Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt b/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt index b4afc27..ea3b5c1 100644 --- a/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt +++ b/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt @@ -1,3 +1,3 @@ ld: warning: ignoring duplicate libraries: '.*liblib1.a', '.*liblib2.a' ld: fatal warning\(s\) induced error \(-fatal_warnings\) -clang: error: linker command failed with exit code 1 \(use -v to see invocation\) +(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\) diff --git a/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake b/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake index c57e727..77ab874 100644 --- a/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake +++ b/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake @@ -17,8 +17,9 @@ macro(run_cmake_and_build test) -DCMake_TEST_Swift=${CMake_TEST_Swift}) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build) set(RunCMake_TEST_NO_CLEAN 1) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . --config Release --verbose ${ARGN}) - + unset(RunCMake_TEST_OUTPUT_MERGE) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) endmacro() -- cgit v0.12