[lmi-commits] [lmi] master da8e769 6/6: Test cell-subelement sorting

[Greg Chicares]

branch: master
commit da8e76980bdf03d0bea138063e12fbf000f2fd5e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Test cell-subelement sorting
    
    * README.schroot: Install xsltproc. Incidentally, uninstall the unused
      vim-fugitive.
    * nychthemeral_test.sh: Filter out expected output of schema test.
      Incidentally, filter out a make-4.2.1 informational message that's
      slightly different from the one given by earlier versions.
    * test_schemata.sh: Test 'sort_cell_subelements.xsl'.
---
 README.schroot       |  4 ++--
 nychthemeral_test.sh |  2 ++
 test_schemata.sh     | 11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.schroot b/README.schroot
index e5a142c..2a75ee9 100644
--- a/README.schroot
+++ b/README.schroot
@@ -101,8 +101,8 @@ mount -t proc -o rw,nosuid,nodev,noexec,relatime proc /proc
 apt-get update
 apt-get --assume-yes install wget g++-mingw-w64 automake libtool make \
  pkg-config git cvs zsh bzip2 unzip sudo wine default-jre fop jing trang \
- g++-multilib libxml2-utils libxslt1-dev vim-gtk vim-doc vim-fugitive \
- shellcheck \
+ g++-multilib libxml2-utils libxslt1-dev vim-gtk vim-doc shellcheck \
+ xsltproc \
  >lmi-buster-apt-get-log 2>&1
 
 # This command should produce little output:
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 86c293b..5d28f5b 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -47,6 +47,7 @@ build_clutter='
 /^make.*\[[0-9]*\]: Entering directory/d
 /^make.*\[[0-9]*\]: Leaving directory/d
 /^make.*\[[0-9]*\]: Nothing to be done for/d
+/^make.*\[[0-9]*\]: warning: -j1 forced in submake: resetting jobserver 
mode.$/d
 /^make.*\[[0-9]*\]: warning: -jN forced in submake: disabling jobserver 
mode.$/d
 /^make.*\[[0-9]*\]: .* is up to date\./d
 /^[^ ]*cpp  *-x /d
@@ -77,6 +78,7 @@ cli_cgi_clutter='
 '
 
 schemata_clutter='
+/^  Test cell-subelement sorting\.$/d
 /^  Test schemata\.\.\.$/d
 /^  Test RNC files with .jing.\.$/d
 /^  Test XSD files with .jing.\.$/d
diff --git a/test_schemata.sh b/test_schemata.sh
index 9b6ec2f..a389cc1 100755
--- a/test_schemata.sh
+++ b/test_schemata.sh
@@ -38,6 +38,17 @@ jar_dir=/opt/lmi/third_party/rng
 
 cp --preserve $srcdir/sample.cns $srcdir/sample.ill .
 
+# XSL template to sort cell subelements.
+
+cp --preserve $srcdir/sort_cell_subelements.xsl .
+
+echo "  Test cell-subelement sorting."
+
+xsltproc sort_cell_subelements.xsl sample.cns > sorted.cns
+xsltproc sort_cell_subelements.xsl sample.ill > sorted.ill
+diff --unified=0 sample.cns sorted.cns
+diff --unified=0 sample.ill sorted.ill
+
 # Primary schemata (RNC: RELAX NG, compact syntax).
 #
 # RNC is primary because it's far more readable than other formats.