[Pkg-cmake-team] Bug#995288: cmake: Linuxish testsuite restuls

[Samuel Thibault]

Package: cmake
Version: 3.18.4-2
Severity: important
Tags: patch upstream fixed-upstream

Hello,

cmake FTBFS on non-Linux ports, this was fixed upstream with the
attached patch, could you cherry-pick it?

Thanks,
Samuel

-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500, 'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.14.0 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages cmake depends on:
ii  cmake-data    3.18.4-2
ii  libarchive13  3.4.3-2+b1
ii  libc6         2.32-4
ii  libcurl4      7.74.0-1.3+b1
ii  libexpat1     2.4.1-2+b1
ii  libgcc-s1     11.2.0-4
ii  libjsoncpp24  1.9.4-4
ii  librhash0     1.4.2-1
iu  libstdc++6    11.2.0-7
ii  libuv1        1.42.0-1
ii  procps        2:3.3.17-5
ii  zlib1g        1:1.2.11.dfsg-2

Versions of packages cmake recommends:
ii  gcc   4:10.2.1-1
ii  make  4.3-4.1

Versions of packages cmake suggests:
pn  cmake-doc    <none>
ii  ninja-build  1.10.1-1

-- no debconf information

-- 
Samuel
 Cliquez sur le lien qui suit dans ce mail...vous n'avez plus qu'a vous
 inscrire pour gagner de l'argent en restant connecte....et puis faites
 passer le message et vous gagnerez encore plus d'argent ...
 -+- AC in NPC : Neuneu a rencontré le Pere Noël -+-
-------------- next part --------------
commit b07812c6de51840a0dc6d3486d4a814fa7ef37f4
Author: Pino Toscano <toscano.pino at tiscali.it>
Date:   Sat Sep 18 21:49:46 2021 +0200

    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).

diff --git a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt
index 37360e8f23..8b6ca94d0a 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