[PATCH cygport 0/4] Test suite fixes

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH cygport 0/4] Test suite fixes

Jon TURNEY
Fixup test suite

Add a GitHub action to run the test suite (unfortunately, there seems to be
no way to turn on case-sensitivity in that environment, so we also need to
adjust tests to function with case-insensitive filesystem)

Jon Turney (4):
  Update tests for build-depends: appearing in source hints
  Updates to tests for package updates
  Add a GitHub action to run tests
  Add some case variants to list of default documentation files
    installed

 .github/workflows/cygwin.yml                  | 119 ++++++++++++++++++
 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 +
 .../autotools/xfce/xfce4-hamster-plugin.list  |   1 +
 testsuite/docbook/sgml/docbook-sgml30.list    |   1 +
 testsuite/docbook/xml/docbook-xml412.list     |   1 +
 testsuite/download/R/R-nanotime.cygport       |   2 +-
 .../dist/multiple/multiple-3.14-1-src.hint    |   1 +
 .../dist/single/single-2.3.4-1-src.hint       |   1 +
 testsuite/lua/all/lua-lfs.list                |   2 +-
 .../perl/ExtUtils-MakeMaker/perl-Carp.list    |   4 +-
 testsuite/perl/Module-Build/perl-Lchown.list  |   6 +-
 testsuite/ruby/gem/ruby-rack-ssl.list         |   1 -
 testsuite/test-driver                         |   2 +-
 16 files changed, 139 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/cygwin.yml

--
2.21.0

Reply | Threaded
Open this post in threaded view
|

[PATCH cygport 1/4] Update tests for build-depends: appearing in source hints

Jon TURNEY
---
 .../dist/multiple/multiple-3.14-1-src.hint                       | 1 +
 .../single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint b/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint
index 51e527e..46ca274 100644
--- a/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint
+++ b/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint
@@ -1,4 +1,5 @@
 category: Base
+build-depends:
 sdesc: "Summary of hints for multiple package test (source)"
 ldesc: "Description of hints for multiple package test (source)"
 skip:
diff --git a/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint b/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint
index 2bb4adc..7bd601a 100644
--- a/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint
+++ b/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint
@@ -1,4 +1,5 @@
 category: Base
+build-depends:
 sdesc: "Summary of hints for single package test"
 ldesc: "Description of hints for single package test"
 skip:
--
2.21.0

Reply | Threaded
Open this post in threaded view
|

[PATCH cygport 2/4] Updates to tests for package updates

Jon TURNEY
In reply to this post by Jon TURNEY
R-nanotime 0.2.3 has been archived
Lua is now 5.3
Perl is now 5.30
No idea where jquery.js might come from...
---
 testsuite/download/R/R-nanotime.cygport          | 2 +-
 testsuite/lua/all/lua-lfs.list                   | 2 +-
 testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list | 4 ++--
 testsuite/perl/Module-Build/perl-Lchown.list     | 6 +++---
 testsuite/ruby/gem/ruby-rack-ssl.list            | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/testsuite/download/R/R-nanotime.cygport b/testsuite/download/R/R-nanotime.cygport
index 57a1f67..71c4934 100644
--- a/testsuite/download/R/R-nanotime.cygport
+++ b/testsuite/download/R/R-nanotime.cygport
@@ -1,7 +1,7 @@
 inherit test-fetch
 
 NAME="R-nanotime"
-VERSION=0.2.3
+VERSION=0.2.4
 RELEASE=1
 CATEGORY="Math"
 SUMMARY="Nanosecond-resolution time for R"
diff --git a/testsuite/lua/all/lua-lfs.list b/testsuite/lua/all/lua-lfs.list
index c85a815..398fec4 100644
--- a/testsuite/lua/all/lua-lfs.list
+++ b/testsuite/lua/all/lua-lfs.list
@@ -1,4 +1,4 @@
-/usr/lib/lua/5.2/lfs.dll
+/usr/lib/lua/5.3/lfs.dll
 /usr/share/doc/lua-lfs/README
 /usr/share/doc/lua-lfs/html/examples.html
 /usr/share/doc/lua-lfs/html/index.html
diff --git a/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list b/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
index 9196542..7133291 100644
--- a/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
+++ b/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
@@ -1,5 +1,5 @@
 /usr/share/doc/perl-Carp/Changes
 /usr/share/doc/perl-Carp/README
 /usr/share/man/man3/Carp.3pm.gz
-/usr/share/perl5/vendor_perl/5.26/Carp.pm
-/usr/share/perl5/vendor_perl/5.26/Carp/Heavy.pm
+/usr/share/perl5/vendor_perl/5.30/Carp.pm
+/usr/share/perl5/vendor_perl/5.30/Carp/Heavy.pm
diff --git a/testsuite/perl/Module-Build/perl-Lchown.list b/testsuite/perl/Module-Build/perl-Lchown.list
index 0faa2aa..97a101b 100644
--- a/testsuite/perl/Module-Build/perl-Lchown.list
+++ b/testsuite/perl/Module-Build/perl-Lchown.list
@@ -1,6 +1,6 @@
-/usr/lib/perl5/vendor_perl/5.26/x86_64-cygwin-threads/Lchown.pm
-/usr/lib/perl5/vendor_perl/5.26/x86_64-cygwin-threads/auto/Lchown/Lchown.bs
-/usr/lib/perl5/vendor_perl/5.26/x86_64-cygwin-threads/auto/Lchown/Lchown.dll
+/usr/lib/perl5/vendor_perl/5.30/x86_64-cygwin-threads/Lchown.pm
+/usr/lib/perl5/vendor_perl/5.30/x86_64-cygwin-threads/auto/Lchown/Lchown.bs
+/usr/lib/perl5/vendor_perl/5.30/x86_64-cygwin-threads/auto/Lchown/Lchown.dll
 /usr/share/doc/perl-Lchown/Changes
 /usr/share/doc/perl-Lchown/README
 /usr/share/doc/perl/html/html3/site/lib/Lchown.html
diff --git a/testsuite/ruby/gem/ruby-rack-ssl.list b/testsuite/ruby/gem/ruby-rack-ssl.list
index 36e76cd..bac57e1 100644
--- a/testsuite/ruby/gem/ruby-rack-ssl.list
+++ b/testsuite/ruby/gem/ruby-rack-ssl.list
@@ -35,7 +35,6 @@
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/zoom.png
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/index.html
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/darkfish.js
-/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/jquery.js
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js.gz
 /usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search.js
--
2.21.0

Reply | Threaded
Open this post in threaded view
|

[PATCH cygport 3/4] Add a GitHub action to run tests

Jon TURNEY
In reply to this post by Jon TURNEY
---
 .github/workflows/cygwin.yml | 116 +++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 .github/workflows/cygwin.yml

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
new file mode 100644
index 0000000..5fd2a2f
--- /dev/null
+++ b/.github/workflows/cygwin.yml
@@ -0,0 +1,116 @@
+name: Cygwin
+on: [push, pull_request]
+
+jobs:
+  cygport:
+    name: cygport
+    runs-on:  windows-latest
+    steps:
+    - name: Turn off line ending conversion in git
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+    - uses: actions/cache@v1
+      with:
+        path: C:\cygwin-packages
+        key: cygwin-packages-${{ hashFiles('**') }}
+        restore-keys: cygwin-packages-
+    - name: Fetch Cygwin installer
+      run: |
+        Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile C:\setup.exe
+      shell: powershell
+      # installer should be cacheable
+    - name: Install Cygwin
+      run: |
+        c:\setup.exe -qgnO -s http://mirrors.kernel.org/sourceware/cygwin/ -l C:\cygwin-packages\ -P ^
+        R,^
+        aspell,^
+        automake,^
+        automoc4,^
+        bzr,^
+        cmake,^
+        cvs,^
+        diffstat,^
+        dos2unix,^
+        extra-cmake-modules,^
+        flexdll,^
+        fontforge,^
+        gcc-g++,^
+        git,^
+        git-archive-all,^
+        gnome-common,^
+        gobject-introspection,^
+        help2man,^
+        httpd-devel,^
+        kf5-kdoctools,^
+        libGL-devel,^
+        libGeoIP-devel,^
+        libKF5XmlGui-devel,^
+        libQt5Core-devel,^
+        libQt5Svg-devel,^
+        libQtTest4-devel,^
+        libRmath,^
+        libartsc-devel,^
+        libbz2-devel,^
+        libcairomm1.0-devel,^
+        libcrypt-devel,^
+        libexif-devel,^
+        libgdk_pixbuf2.0-devel,^
+        libgirepository1.0-devel,^
+        libglibmm2.4-devel,^
+        libicu-devel,^
+        libkdecore4-devel,^
+        libkdecore5-devel,^
+        liblzma-devel,^
+        libnotify-devel,^
+        libpango1.0-devel,^
+        libqca-devel,^
+        libqca-qt5-devel,^
+        libtirpc-devel,^
+        libxfce4ui1-devel,^
+        libxfconf0-devel,^
+        lndir,^
+        lua-devel,^
+        make,^
+        mate-common,^
+        mercurial,^
+        meson,^
+        mingw64-i686-gcc-core,^
+        mingw64-i686-qt5-base,^
+        mingw64-i686-qt5-tools,^
+        mm-common,^
+        monotone,^
+        ninja,^
+        ocaml,^
+        ocaml-findlib,^
+        patch,^
+        perl,^
+        perl-Module-Build,^
+        php-PEAR,^
+        python-gtk2.0-devel,^
+        python2-devel,^
+        python2-pip,^
+        python3-pip,^
+        python3-setuptools,^
+        python2-wheel,^
+        python3-wheel,^
+        python37-pip,^
+        robodoc,^
+        ruby,^
+        subversion,^
+        unzip,^
+        xfce4-dev-tools,^
+        xfce4-panel-devel
+      shell: cmd
+    - name: Set PATH
+      run: |
+        echo '::set-env name=PATH::C:\cygwin64\bin;C:\cygwin64\lib\lapack;%SYSTEMROOT%\system32'
+    - name: Build
+      run: |
+        bash -c 'meson _build && ninja -C _build'
+    - name: Test
+      run: |
+        bash -c 'meson test -C _build --print-errorlogs'
--
2.21.0

Reply | Threaded
Open this post in threaded view
|

[PATCH cygport 4/4] Add some case variants to list of default documentation files installed

Jon TURNEY
In reply to this post by Jon TURNEY
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

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH cygport 0/4] Test suite fixes

Yaakov Selkowitz
In reply to this post by Jon TURNEY
On Wed, 2020-03-25 at 16:34 +0000, Jon Turney wrote:

> Fixup test suite
>
> Add a GitHub action to run the test suite (unfortunately, there seems to be
> no way to turn on case-sensitivity in that environment, so we also need to
> adjust tests to function with case-insensitive filesystem)
>
> Jon Turney (4):
>   Update tests for build-depends: appearing in source hints
>   Updates to tests for package updates
>   Add a GitHub action to run tests
>   Add some case variants to list of default documentation files
>     installed

Never imagined cygport would get CI.  I'll trust you know what you're
doing wrt github integration, otherwise LGTM, please merge.

--
Yaakov