[med-svn] [r-cran-etm] 04/07: Make test more tolerant against different output to compare with

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-etm.

commit 8a0c01065d3eab1a63d57b64c052d4124d2b9944
Author: Andreas Tille <tille at debian.org>
Date:   Fri Apr 29 07:41:32 2016 +0000

    Make test more tolerant against different output to compare with
---
 debian/changelog           |  6 ++++++
 debian/tests/run-unit-test | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fc59e6d..82bee93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-etm (0.6-2-3) unstable; urgency=medium
+
+  * Make test more tolerant against different output to compare with
+
+ -- Andreas Tille <tille at debian.org>  Fri, 29 Apr 2016 09:36:56 +0200
+
 r-cran-etm (0.6-2-2) unstable; urgency=medium
 
   * Fix autopkgtest
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 51a624a..affe6d0 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -2,6 +2,20 @@
 
 pkg=r-cran-etm
 
+# The saved result files do contain some differences in metadata and we also
+# need to ignore version differences of R
+filter() {
+    grep -v -e '^R version' \
+        -e '^Copyright (C)' \
+        -e '^Platform: ' \
+        -e '^ISBN 3' \
+        -e '^Loading required package: lattice' \
+        -e '^Loading required package: splines' \
+       $1 | \
+    sed -e '/^> *proc\.time()$/,$d' \
+        -e '/^  Natural language support but running in an English locale/,+1d'
+}
+
 if [ "$ADTTMP" = "" ] ; then
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
@@ -10,7 +24,9 @@ cp /usr/share/doc/${pkg}/tests/* $ADTTMP
 find . -name "*.gz" -exec gunzip \{\} \;
 for htest in `ls *.R | sed 's/\.R$//'` ; do
    LC_ALL=C R --no-save < ${htest}.R 2>&1 | tee > ${htest}.Rout
-   diff -u ${htest}.Rout.save ${htest}.Rout
+   filter ${htest}.Rout.save > ${htest}.Rout.save_
+   filter ${htest}.Rout > ${htest}.Rout_
+   diff -u ${htest}.Rout.save_ ${htest}.Rout_
    if [ ! $? ] ; then
      echo "Test ${htest} failed"
      exit 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-etm.git