Просмотр исходного кода

Merge topic 'test-tolerate-env-Werror' into release-4.0

2f9211b4e4 Tests: Isolate RunCMake.LinkWarningAsError from -Werror flags in environment

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10587
Brad King 10 месяцев назад
Родитель
Сommit
d88b3e3ece
1 измененных файлов с 10 добавлено и 0 удалено
  1. 10 0
      Tests/RunCMake/LinkWarningAsError/RunCMakeTest.cmake

+ 10 - 0
Tests/RunCMake/LinkWarningAsError/RunCMakeTest.cmake

@@ -1,5 +1,15 @@
 include(RunCMake)
 
+# Isolate test cases from the caller's environment.
+if(DEFINED ENV{CFLAGS})
+  string(REGEX REPLACE "-Werror[^ ]*" "" cflags "$ENV{CFLAGS}")
+  set(ENV{CFLAGS} "${cflags}")
+endif()
+if(DEFINED ENV{LDFLAGS})
+  string(REGEX REPLACE "-Wl,--fatal-warnings[^ ]*" "" ldflags "$ENV{LDFLAGS}")
+  set(ENV{LDFLAGS} "${ldflags}")
+endif()
+
 run_cmake(BadValue)
 
 function(run_link_warn test)