[Pkg-libvirt-commits] [libguestfs] 43/59: tests: skip the output of test-virt-rescue.pl from RUN_OUTPUT_FILE

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 56efdb29bf5a2aad1e5326c9a378155858fc579e
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Fri Mar 14 11:24:22 2014 +0100

    tests: skip the output of test-virt-rescue.pl from RUN_OUTPUT_FILE
    
    The output of test-virt-rescue.pl contains non-ASCII chars which give
    troubles when being XSLT-transformed, so just avoid its output to leave
    the rest of the resulting XML well-formed.
---
 run.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/run.in b/run.in
index a508c38..6009708 100755
--- a/run.in
+++ b/run.in
@@ -264,7 +264,11 @@ if [ -n "$RUN_OUTPUT_FILE" ]; then
     testname=`echo "$1" | sed -e 's,^./,,g'`
     echo "<test rescode=\"$fail\" name=\"$testname\" time=\"$(($end_t - $start_t))\">" >> $RUN_OUTPUT_FILE
     echo "<![CDATA[" >> $RUN_OUTPUT_FILE
-    cat $tmpout >> $RUN_OUTPUT_FILE
+    # skip the results of test-virt-rescue.pl, as they contain
+    # non-ASCII chars which give troubles to xsltproc
+    if ! echo "$testname" | grep test-virt-rescue.pl &>/dev/null ; then
+      cat $tmpout >> $RUN_OUTPUT_FILE
+    fi
     echo "]]>" >> $RUN_OUTPUT_FILE
     echo "</test>" >> $RUN_OUTPUT_FILE
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git