[med-svn] r21815 - in trunk/packages/R/r-cran-etm/trunk/debian: . tests

[Andreas Tille]

Author: tille
Date: 2016-04-29 07:41:32 +0000 (Fri, 29 Apr 2016)
New Revision: 21815

Modified:
   trunk/packages/R/r-cran-etm/trunk/debian/changelog
   trunk/packages/R/r-cran-etm/trunk/debian/tests/run-unit-test
Log:
Make test more tolerant against different output to compare with


Modified: trunk/packages/R/r-cran-etm/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-etm/trunk/debian/changelog	2016-04-29 07:39:29 UTC (rev 21814)
+++ trunk/packages/R/r-cran-etm/trunk/debian/changelog	2016-04-29 07:41:32 UTC (rev 21815)
@@ -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

Modified: trunk/packages/R/r-cran-etm/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-etm/trunk/debian/tests/run-unit-test	2016-04-29 07:39:29 UTC (rev 21814)
+++ trunk/packages/R/r-cran-etm/trunk/debian/tests/run-unit-test	2016-04-29 07:41:32 UTC (rev 21815)
@@ -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 @@
 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