[r-cran-sp] 40/42: Drop autopktests dependency on r-cran-rgeos, skip tests that fail without it

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository r-cran-sp.

commit 07279405ef6401685fe4ef7eb3d6b1918ca54e52
Author: Graham Inggs <ginggs at debian.org>
Date:   Sun Sep 10 07:21:10 2017 +0000

    Drop autopktests dependency on r-cran-rgeos, skip tests that fail without it
---
 debian/changelog           | 7 +++++++
 debian/tests/control       | 2 +-
 debian/tests/run-unit-test | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 15d7859..f3b61a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+r-cran-sp (1:1.2-5-2) unstable; urgency=medium
+
+  * Drop autopktests dependency on r-cran-rgeos,
+    skip tests that fail without it (Closes: #859871)
+
+ -- Graham Inggs <ginggs at debian.org>  Sun, 10 Sep 2017 07:08:10 +0000
+
 r-cran-sp (1:1.2-5-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/tests/control b/debian/tests/control
index 5dbbd8e..25377fc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, r-cran-runit, r-cran-rgeos
+Depends: @, r-cran-runit
 Restrictions: allow-stderr
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index ea08e53..2e26f46 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -25,6 +25,8 @@ fi
 cd $ADTTMP
 cp /usr/share/doc/${pkg}/tests/* $ADTTMP
 gunzip *.gz
+# skip tests that fail without r-cran-rgeos
+rm -f agg.R over2.R pass1.R
 for htest in `ls *.R | sed 's/\.R$//'` ; do
    LC_ALL=C R --no-save < ${htest}.R 2>&1 | tee > ${htest}.Rout
    filter ${htest}.Rout.save > ${htest}.Rout.save_

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-sp.git