瀏覽代碼

Merge topic 'tests-cpack-deb-non-linux'

b07812c6de Tests: fix RunCMake.CPack_DEB.EXTRA on Debian non-Linux OSes

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6540
Brad King 4 年之前
父節點
當前提交
5fa9a65b1e
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt

+ 2 - 2
Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt

@@ -1,6 +1,6 @@
 CPack Warning: Adding file to tar:
 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
 #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles
 CPack Warning: Adding file to tar:
 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
 #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles