diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-06 13:47:39 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-06 09:47:50 -0400 |
| commit | 058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c (patch) | |
| tree | 1766688d626e0b0ce160c39d3843ced3e09b4849 /Tests/RunCMake/CPack | |
| parent | a27fa90aa1bc88a1633c51a8e6951373d6c62499 (diff) | |
| parent | 46c89c77de3216088afe11ffba33321b2cbb81e2 (diff) | |
| download | cmake-058253aa87e23f1ec6fd6f0a06262fa24a3e8d2c.tar.gz | |
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
Diffstat (limited to 'Tests/RunCMake/CPack')
| -rw-r--r-- | Tests/RunCMake/CPack/RPM/default_expected_stderr.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/CPack/RPM/default_expected_stderr.txt b/Tests/RunCMake/CPack/RPM/default_expected_stderr.txt index 6c87ca0c0a..404076bda9 100644 --- a/Tests/RunCMake/CPack/RPM/default_expected_stderr.txt +++ b/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( +|$))*$ |