Otherwise, if such a file is present with variant case, it is only
installed on case-insensitive systems, making tests behave differently
there.
Add 'Changelog' to the explicit list of docs to package used in
libtxc_dxtn.cygport.
Add documentation files which are now installed into expected filelists
Note that where default_docs contains case variants which are degenerate
on a case-insensitive filesystem, the first one controls the filename of
the installed file on a case-insensitive but case-preserving filesystem.
There's no way to always ensure that matches the actual case of the
filename, so filelists must be compared case-insensitively, if we have a
case-insensitive filesystem.
Also:
Report filelist differences, rather than just comparision result
---
.github/workflows/cygwin.yml | 3 +++
lib/src_postinst.cygpart | 8 ++++----
testsuite/aspell/dict/aspell-pa.list | 1 +
testsuite/autotools/c/libtxc_dxtn.cygport | 2 +-
testsuite/autotools/c/libtxc_dxtn.list | 1 +
testsuite/autotools/xfce/xfce4-hamster-plugin.list | 1 +
testsuite/docbook/sgml/docbook-sgml30.list | 1 +
testsuite/docbook/xml/docbook-xml412.list | 1 +
testsuite/test-driver | 2 +-
9 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 5fd2a2f..116f9c9 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -1,6 +1,9 @@
name: Cygwin
on: [push, pull_request]
+env:
+ CASE_INSENSITIVE: 1
+
jobs:
cygport:
name: cygport
diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 8489533..6ea9ebe 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -433,16 +433,16 @@ __prepdoc() {
local pkg_docs_var;
local pkg_hint;
local default_docs="\
- ANNOUNCE ANNOUNCEMENTS AUTHOR AUTHORS \
+ ANNOUNCE announce ANNOUNCEMENTS AUTHOR AUTHORS \
BUG-REPORTS BUGS \
- CHANGES Changes ChangeLog CONTRIBUTORS COPYING COPYING-DOCS \
- COPYING.LIB COPYING.LGPL* COPYRIGHT CREDITS \
+ CHANGES Changes Change[Ll]og CONTRIBUTORS COPYING COPYING-DOCS \
+ COPYING.LIB COPYING.LGPL* Copyright COPYRIGHT CREDITS \
FAQ GPL HACKING HISTORY HOW-TO-CONTRIBUTE KNOWNBUG \
LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL \
LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 \
LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 \
LEGAL LICENCE LICENSE MAINTAINERS NEWS NOTES NOTICE \
- PROGLIST README THANKS TODO WHATSNEW";
+ PROGLIST README readme THANKS TODO WHATSNEW";
cd ${S};
diff --git a/testsuite/aspell/dict/aspell-pa.list
b/testsuite/aspell/dict/aspell-pa.list
index 01d94a0..16d8cf3 100644
--- a/testsuite/aspell/dict/aspell-pa.list
+++ b/testsuite/aspell/dict/aspell-pa.list
@@ -5,4 +5,5 @@
/usr/lib/aspell-0.60/u-guru.cmap
/usr/lib/aspell-0.60/u-guru.cset
/usr/share/doc/aspell-pa/COPYING
+/usr/share/doc/aspell-pa/Copyright
/usr/share/doc/aspell-pa/README
diff --git a/testsuite/autotools/c/libtxc_dxtn.cygport
b/testsuite/autotools/c/libtxc_dxtn.cygport
index 6b70d5c..ba7232c 100644
--- a/testsuite/autotools/c/libtxc_dxtn.cygport
+++ b/testsuite/autotools/c/libtxc_dxtn.cygport
@@ -8,7 +8,7 @@ HOMEPAGE="http://dri.freedesktop.org/wiki/S3TC";
SRC_URI="http://cgit.freedesktop.org/~mareko/libtxc_dxtn/snapshot/libtxc_dxtn-${VERSION}.tar.bz2";
PKG_NAMES="${NAME} ${NAME}-devel"
-libtxc_dxtn_DOCS="COPYING"
+libtxc_dxtn_DOCS="COPYING Changelog"
libtxc_dxtn_CONTENTS="usr/bin/cygtxc_dxtn.dll"
libtxc_dxtn_devel_REQUIRES="libGL-devel"
libtxc_dxtn_devel_CONTENTS="usr/include/txc_dxtn.h usr/lib/libtxc_dxtn.dll.a"
diff --git a/testsuite/autotools/c/libtxc_dxtn.list
b/testsuite/autotools/c/libtxc_dxtn.list
index fc1e961..0edf359 100644
--- a/testsuite/autotools/c/libtxc_dxtn.list
+++ b/testsuite/autotools/c/libtxc_dxtn.list
@@ -2,3 +2,4 @@
/usr/include/txc_dxtn.h
/usr/lib/libtxc_dxtn.dll.a
/usr/share/doc/libtxc_dxtn/COPYING
+/usr/share/doc/libtxc_dxtn/Changelog
diff --git a/testsuite/autotools/xfce/xfce4-hamster-plugin.list
b/testsuite/autotools/xfce/xfce4-hamster-plugin.list
index 1f6b403..76e871f 100644
--- a/testsuite/autotools/xfce/xfce4-hamster-plugin.list
+++ b/testsuite/autotools/xfce/xfce4-hamster-plugin.list
@@ -5,6 +5,7 @@
/usr/share/doc/xfce4-hamster-plugin/ChangeLog
/usr/share/doc/xfce4-hamster-plugin/NEWS
/usr/share/doc/xfce4-hamster-plugin/README
+/usr/share/doc/xfce4-hamster-plugin/readme.md
/usr/share/locale/de/LC_MESSAGES/xfce4-hamster-plugin.mo
/usr/share/locale/es/LC_MESSAGES/xfce4-hamster-plugin.mo
/usr/share/locale/tr/LC_MESSAGES/xfce4-hamster-plugin.mo
diff --git a/testsuite/docbook/sgml/docbook-sgml30.list
b/testsuite/docbook/sgml/docbook-sgml30.list
index 1fb14d1..db84766 100644
--- a/testsuite/docbook/sgml/docbook-sgml30.list
+++ b/testsuite/docbook/sgml/docbook-sgml30.list
@@ -1,5 +1,6 @@
/etc/postinstall/docbook-sgml30.sh
/etc/preremove/docbook-sgml30.sh
+/usr/share/doc/docbook-sgml30/announce.txt
/usr/share/sgml/docbook/sgml-dtd-3.0/cals-tbl.dtd
/usr/share/sgml/docbook/sgml-dtd-3.0/catalog
/usr/share/sgml/docbook/sgml-dtd-3.0/dbgenent.mod
diff --git a/testsuite/docbook/xml/docbook-xml412.list
b/testsuite/docbook/xml/docbook-xml412.list
index 881a511..86b0a1e 100644
--- a/testsuite/docbook/xml/docbook-xml412.list
+++ b/testsuite/docbook/xml/docbook-xml412.list
@@ -1,6 +1,7 @@
/etc/postinstall/docbook-xml412.sh
/etc/preremove/docbook-xml412.sh
/usr/share/doc/docbook-xml412/ChangeLog
+/usr/share/doc/docbook-xml412/readme.txt
/usr/share/sgml/docbook/xml-dtd-4.1.2/calstblx.dtd
/usr/share/sgml/docbook/xml-dtd-4.1.2/dbcentx.mod
/usr/share/sgml/docbook/xml-dtd-4.1.2/dbgenent.mod
diff --git a/testsuite/test-driver b/testsuite/test-driver
index 30893c4..d9800ec 100755
--- a/testsuite/test-driver
+++ b/testsuite/test-driver
@@ -31,4 +31,4 @@ do
done
# compare filelist
-cmp ${top_srcdir}/testsuite/$test/*.list <(${top_builddir}/bin/cygport-inplace
*.cygport list)
+diff -u ${CASE_INSENSITIVE:+-i} ${top_srcdir}/testsuite/$test/*.list
<(${top_builddir}/bin/cygport-inplace *.cygport list)
--
2.21.0
