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

[Andreas Tille]

Author: tille
Date: 2016-04-29 09:28:51 +0000 (Fri, 29 Apr 2016)
New Revision: 21821

Modified:
   trunk/packages/R/r-cran-qtl/trunk/debian/changelog
   trunk/packages/R/r-cran-qtl/trunk/debian/docs
   trunk/packages/R/r-cran-qtl/trunk/debian/links
   trunk/packages/R/r-cran-qtl/trunk/debian/rules
   trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test
Log:
Fix installation of test data inside the package, Fix autopkgtest



Modified: trunk/packages/R/r-cran-qtl/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/changelog	2016-04-29 07:59:53 UTC (rev 21820)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/changelog	2016-04-29 09:28:51 UTC (rev 21821)
@@ -1,3 +1,10 @@
+r-cran-qtl (1.39-5-2) unstable; urgency=medium
+
+  * Fix installation of test data inside the package
+  * Fix autopkgtest
+
+ -- Andreas Tille <tille at debian.org>  Fri, 29 Apr 2016 11:15:13 +0200
+
 r-cran-qtl (1.39-5-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/docs
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/docs	2016-04-29 07:59:53 UTC (rev 21820)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/docs	2016-04-29 09:28:51 UTC (rev 21821)
@@ -1,2 +1,3 @@
 debian/README.test
 debian/tests/run-unit-test
+tests
\ No newline at end of file

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/links
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/links	2016-04-29 07:59:53 UTC (rev 21820)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/links	2016-04-29 09:28:51 UTC (rev 21821)
@@ -1,4 +1 @@
-usr/lib/R/site-library/qtl/sampledata/gen.txt		usr/share/doc/r-cran-qtl/tests/gen.txt
-usr/lib/R/site-library/qtl/sampledata/listeria.csv	usr/share/doc/r-cran-qtl/tests/listeria.csv
-usr/lib/R/site-library/qtl/sampledata/map.txt		usr/share/doc/r-cran-qtl/tests/map.txt
-usr/lib/R/site-library/qtl/sampledata/phe.txt		usr/share/doc/r-cran-qtl/tests/phe.txt
+usr/lib/R/site-library/qtl/sampledata	usr/share/doc/r-cran-qtl/examples

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/rules	2016-04-29 07:59:53 UTC (rev 21820)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/rules	2016-04-29 09:28:51 UTC (rev 21821)
@@ -1,9 +1,3 @@
 #!/usr/bin/make -f
 
 include /usr/share/R/debian/r-cran.mk
-
-install/$(package)::
-	mkdir -p debian/$(package)/usr/share/doc/$(package)
-	mv debian/$(package)/usr/lib/R/site-library/$(cranNameOrig)/contrib debian/$(package)/usr/share/doc/$(package)/examples
-	mkdir -p debian/$(package)/usr/share/doc/$(package)/tests
-	cp -a tests/*.R tests/*.csv tests/*.map tests/*.raw tests/*.Rout.save debian/$(package)/usr/share/doc/$(package)/tests

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test	2016-04-29 07:59:53 UTC (rev 21820)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test	2016-04-29 09:28:51 UTC (rev 21821)
@@ -5,8 +5,8 @@
   ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
 cd $ADTTMP
-cp /usr/share/doc/${pkg}/tests/* $ADTTMP
-gunzip -r *.gz
+cp -a /usr/share/doc/${pkg}/tests/* $ADTTMP
+find . -name "*.gz" -exec gunzip \{\} \;
 for runtest in `ls *.R` ; do
    LC_ALL=C R --no-save < $runtest >/dev/null
    if [ ! $? ] ; then
@@ -16,4 +16,4 @@
      echo "Test ${runtest} passed"
    fi
 done
-rm -rf $ADTTMP/*
+# rm -rf $ADTTMP/*