[lmi-commits] [lmi] master 8b9f213 2/4: Install native xmllint in chroot; adapt script to it

[Greg Chicares]

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

    Install native xmllint in chroot; adapt script to it
    
    Used native xmllint to avoid funky wine workarounds. Filtered out some
    nonessential text that this updated version adds to its error messages.
---
 README.schroot   | 2 +-
 test_schemata.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.schroot b/README.schroot
index 6f2cb81..f39854f 100644
--- a/README.schroot
+++ b/README.schroot
@@ -101,7 +101,7 @@ mount -t proc -o rw,nosuid,nodev,noexec,relatime proc /proc
 apt-get update
 apt-get --assume-yes install g++-mingw-w64 automake libtool make \
  pkg-config git zsh bzip2 unzip sudo wine default-jre fop jing trang \
- g++-multilib libxslt1-dev vim vim-doc \
+ g++-multilib libxml2-utils libxslt1-dev vim vim-doc \
  >cross-lmi-apt-get-log 2>&1
 
 # This command should produce little output:
diff --git a/test_schemata.sh b/test_schemata.sh
index 31259be..33831ad 100755
--- a/test_schemata.sh
+++ b/test_schemata.sh
@@ -162,6 +162,8 @@ java -jar $jar_dir/jing.jar multiple_cell_document.rng    
sample_bad.cns >> cns.
 echo "  invalid input, xmllint, .rng:"                                   >> 
cns.eraseme 2>&1
 xmllint --noout --relaxng multiple_cell_document.rng      sample_bad.cns >> 
cns.eraseme 2>&1
 sed -e 's/^.*error: //;s/\.cns fails/ fails/;s/  *$//' -i cns.eraseme
+sed -e 's/^.*Schemas validity error : //' -i cns.eraseme
+sed -e 's/^.*Relax-NG validity error : //' -i cns.eraseme
 diff --unified=0 touchstone.eraseme cns.eraseme
 
 echo "  Test invalid input: '.ill'."
@@ -179,6 +181,8 @@ java -jar $jar_dir/jing.jar single_cell_document.rng      
sample_bad.ill >> ill.
 echo "  invalid input, xmllint, .rng:"                                   >> 
ill.eraseme 2>&1
 xmllint --noout --relaxng single_cell_document.rng        sample_bad.ill >> 
ill.eraseme 2>&1
 sed -e 's/^.*error: //;s/\.ill fails/ fails/;s/  *$//' -i ill.eraseme
+sed -e 's/^.*Schemas validity error : //' -i ill.eraseme
+sed -e 's/^.*Relax-NG validity error : //' -i ill.eraseme
 diff --unified=0 touchstone.eraseme ill.eraseme
 
 echo "  Regenerate XSD files as they should appear in the repository."