diff options
| author | Pino Toscano <toscano.pino@tiscali.it> | 2021-09-18 19:49:46 (GMT) |
|---|---|---|
| committer | Pino Toscano <toscano.pino@tiscali.it> | 2021-09-18 19:49:46 (GMT) |
| commit | b07812c6de51840a0dc6d3486d4a814fa7ef37f4 (patch) | |
| tree | 91331686ef585743640849153f43de4ba331082c /Tests/RunCMake/CPack | |
| parent | e4ad87c5dd54cc79029bc592db7a3991212ffe4d (diff) | |
| download | CMake-b07812c6de51840a0dc6d3486d4a814fa7ef37f4.zip CMake-b07812c6de51840a0dc6d3486d4a814fa7ef37f4.tar.gz CMake-b07812c6de51840a0dc6d3486d4a814fa7ef37f4.tar.bz2 | |
Tests: fix RunCMake.CPack_DEB.EXTRA on Debian non-Linux OSes
The generated path with the packages uses $CPACK_TOPLEVEL_TAG, which
by default is $CPACK_SYSTEM_NAME, thus the OS name.
To make the expected stderr match also non-Linux OSes, accept any
non-slash characters in place of "Linux", so it works also on other
Debian OSes (e.g. Debian/Hurd).
Diffstat (limited to 'Tests/RunCMake/CPack')
| -rw-r--r-- | Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt index 37360e8..8b6ca94 100644 --- a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt +++ b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt @@ -1,6 +1,6 @@ CPack Warning: Adding file to tar: -#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/bas +#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/[^/]+/DEB/extra-0.1.1-[^/]+/bas #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles CPack Warning: Adding file to tar: -#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/foo +#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/[^/]+/DEB/extra-0.1.1-[^/]+/foo #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles |