[med-svn] r21811 - in trunk/packages/R/r-cran-cmprsk/trunk/debian: . tests
Andreas Tille
tille at moszumanska.debian.org
Fri Apr 29 07:15:38 UTC 2016
Author: tille
Date: 2016-04-29 07:15:37 +0000 (Fri, 29 Apr 2016)
New Revision: 21811
Modified:
trunk/packages/R/r-cran-cmprsk/trunk/debian/changelog
trunk/packages/R/r-cran-cmprsk/trunk/debian/control
trunk/packages/R/r-cran-cmprsk/trunk/debian/tests/run-unit-test
Log:
Make test more tolerant against different output to compare with
Modified: trunk/packages/R/r-cran-cmprsk/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-cmprsk/trunk/debian/changelog 2016-04-29 06:58:29 UTC (rev 21810)
+++ trunk/packages/R/r-cran-cmprsk/trunk/debian/changelog 2016-04-29 07:15:37 UTC (rev 21811)
@@ -1,3 +1,10 @@
+r-cran-cmprsk (2.2-7-2) unstable; urgency=medium
+
+ * Make test more tolerant against different output to compare with
+ * cme fix dpkg-control
+
+ -- Andreas Tille <tille at debian.org> Fri, 29 Apr 2016 09:10:40 +0200
+
r-cran-cmprsk (2.2-7-1) unstable; urgency=low
* Initial release (closes: #799920)
Modified: trunk/packages/R/r-cran-cmprsk/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-cmprsk/trunk/debian/control 2016-04-29 06:58:29 UTC (rev 21810)
+++ trunk/packages/R/r-cran-cmprsk/trunk/debian/control 2016-04-29 07:15:37 UTC (rev 21811)
@@ -8,8 +8,8 @@
cdbs,
r-base-dev,
r-cran-survival
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-cmprsk/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-cmprsk/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-cmprsk/trunk/
Homepage: https://cran.r-project.org/web/packages/cmprsk/
Modified: trunk/packages/R/r-cran-cmprsk/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-cmprsk/trunk/debian/tests/run-unit-test 2016-04-29 06:58:29 UTC (rev 21810)
+++ trunk/packages/R/r-cran-cmprsk/trunk/debian/tests/run-unit-test 2016-04-29 07:15:37 UTC (rev 21811)
@@ -2,6 +2,20 @@
pkg=r-cran-cmprsk
+# 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 '[Bb]uggy version of Kinderman-Ramage generator use' \
+ -e '^Loading required package: splines' \
+ $1 | \
+ sed '/^> *proc\.time()$/,$d'
+}
+
+
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
More information about the debian-med-commit
mailing list