Merge topic 'ci-fixups'

46c89c77de gitlab-ci: Rename CI config variable to avoid conflict with CMAKE_BUILD_TYPE
3ede66e17a Tests: Fix newline matching in several RunCMake.* cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6298

.gitlab/ci/configure_common.cmake

@@ -6,8 +6,8 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY "ON" CACHE BOOL "")
 set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "")
 set(CMake_TEST_INSTALL "OFF" CACHE BOOL "")
 
-if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "")
-  set(CMAKE_BUILD_TYPE "$ENV{CMAKE_BUILD_TYPE}" CACHE STRING "")
+if (NOT "$ENV{CMAKE_CI_BUILD_TYPE}" STREQUAL "")
+  set(CMAKE_BUILD_TYPE "$ENV{CMAKE_CI_BUILD_TYPE}" CACHE STRING "")
 endif ()
 
 if (NOT configure_no_sccache)

.gitlab/ci/gitlab_ci.cmake

@@ -26,8 +26,8 @@ set(CTEST_SITE "gitlab-ci")
 set(ctest_model "Experimental")
 
 # Default to Release builds.
-if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "")
-  set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_BUILD_TYPE}")
+if (NOT "$ENV{CMAKE_CI_BUILD_TYPE}" STREQUAL "")
+  set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CI_BUILD_TYPE}")
 endif ()
 if (NOT CTEST_BUILD_CONFIGURATION)
   set(CTEST_BUILD_CONFIGURATION "Release")

.gitlab/os-linux.yml

@@ -90,7 +90,7 @@
 
     variables:
         CMAKE_CONFIGURATION: fedora34_clang_analyzer
-        CMAKE_BUILD_TYPE: Debug
+        CMAKE_CI_BUILD_TYPE: Debug
         CTEST_NO_WARNINGS_ALLOWED: 1
         CMake_SKIP_INSTALL: 1
 
@@ -168,7 +168,7 @@
 
 .fedora_memcheck:
     variables:
-        CMAKE_BUILD_TYPE: RelWithDebInfo
+        CMAKE_CI_BUILD_TYPE: RelWithDebInfo
 
 .fedora_asan_addon:
     extends: .fedora_memcheck

.gitlab/os-windows.yml

@@ -28,7 +28,7 @@
         # Debug and RelWithDebinfo build types use the `/Zi` which results in
         # uncacheable compiations.
         # https://github.com/mozilla/sccache/issues/242
-        CMAKE_BUILD_TYPE: Release
+        CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 .windows_vs2019_x64_ninja:

Tests/RunCMake/CPack/RPM/default_expected_stderr.txt

@@ -1 +1,2 @@
-^(CPackRPM: Will use GENERATED spec file: (/[^/]*)*/Tests/RunCMake/RPM\.[^/]*/CPack/[^-]*(-package-target)?-build((-[^-]*-subtest/)|/)_CPack_Packages/.*/RPM/SPECS/[^\.]*\.spec(\n|$))*$
+^(CPackRPM: Will use GENERATED spec file: (/[^/]*)*/Tests/RunCMake/RPM\.[^/]*/CPack/[^-]*(-package-target)?-build((-[^-]*-subtest/)|/)_CPack_Packages/.*/RPM/SPECS/[^\.]*\.spec(
+|$))*$

Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-test-stdout.txt

@@ -8,11 +8,13 @@ Debug/discovery_timeout_test_NOT_BUILT
 Debug/discovery_timeout_test_NOT_BUILT(\.exe)?
 Debug/discovery_timeout_test_NOT_BUILT
 Debug/discovery_timeout_test_NOT_BUILT(\.exe)?
-[^\n]+discovery_timeout_test_NOT_BUILT +\.+\*\*\*Not Run +[0-9.]+ sec
+[^
+]+discovery_timeout_test_NOT_BUILT +\.+\*\*\*Not Run +[0-9.]+ sec
 +
 0% tests passed, 1 tests failed out of 1
 +
 Total Test time \(real\) =   +[0-9.]+ sec
 +
 The following tests FAILED:
-[^\n]+discovery_timeout_test_NOT_BUILT \(Not Run\)
+[^
+]+discovery_timeout_test_NOT_BUILT \(Not Run\)

Tests/RunCMake/GoogleTest/GoogleTest-property-timeout1-stdout.txt

@@ -1,10 +1,12 @@
 Test project .*GoogleTest-build
 [ \t]*Start [0-9]+: property_timeout.case_no_discovery
-[^\n]+property_timeout.case_no_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
+[^
+]+property_timeout.case_no_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
 +
 0% tests passed, 1 tests failed out of 1
 +
 Total Test time \(real\) = +[0-9.]+ sec
 +
 The following tests FAILED:
-[^\n]*property_timeout.case_no_discovery \(Timeout\)
+[^
+]*property_timeout.case_no_discovery \(Timeout\)

Tests/RunCMake/GoogleTest/GoogleTest-property-timeout2-stdout.txt

@@ -1,10 +1,12 @@
 Test project .*GoogleTest-build
 [ \t]*Start [0-9]+: property_timeout.case_with_discovery
-[^\n]+property_timeout.case_with_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
+[^
+]+property_timeout.case_with_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
 +
 0% tests passed, 1 tests failed out of 1
 +
 Total Test time \(real\) = +[0-9.]+ sec
 +
 The following tests FAILED:
-[^\n]*property_timeout.case_with_discovery \(Timeout\)
+[^
+]*property_timeout.case_with_discovery \(Timeout\)

Tests/RunCMake/add_subdirectory/CMP0082-NEW-install-component-stdout.txt

@@ -1,4 +1,5 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- sub
 -- top$

Tests/RunCMake/add_subdirectory/CMP0082-NEW-install-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- sub
 -- top$

Tests/RunCMake/add_subdirectory/CMP0082-OLD-install-component-stdout.txt

@@ -1,4 +1,5 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-OLD-install-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-Nested-install-component-stdout.txt

@@ -1,4 +1,5 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-Nested-install-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-NestedSub-install-component-stdout.txt

@@ -1,4 +1,5 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-NestedSub-install-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-NoTopInstall-install-component-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-NoTopInstall-install-stdout.txt

@@ -1,2 +1,3 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-None-install-component-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- top$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-None-install-stdout.txt

@@ -1,2 +1,3 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- top$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-install-component-stdout.txt

@@ -1,4 +1,5 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- Install component: "Unspecified"
 -- top
 -- sub$

Tests/RunCMake/add_subdirectory/CMP0082-WARN-install-stdout.txt

@@ -1,3 +1,4 @@
-^-- Install configuration: "[^\n]*"
+^-- Install configuration: "[^
+]*"
 -- top
 -- sub$