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

[Andreas Tille]

Author: tille
Date: 2014-06-23 12:06:38 +0000 (Mon, 23 Jun 2014)
New Revision: 17285

Modified:
   trunk/packages/R/r-cran-qtl/trunk/debian/README.test
   trunk/packages/R/r-cran-qtl/trunk/debian/changelog
   trunk/packages/R/r-cran-qtl/trunk/debian/control
   trunk/packages/R/r-cran-qtl/trunk/debian/docs
   trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test
Log:
New upstream version, small changes to autopkgtest script


Modified: trunk/packages/R/r-cran-qtl/trunk/debian/README.test
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/README.test	2014-06-23 07:14:08 UTC (rev 17284)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/README.test	2014-06-23 12:06:38 UTC (rev 17285)
@@ -1,13 +1,8 @@
 Notes on how this package can be tested.
 ────────────────────────────────────────
 
-This package can be tested by running the unit test:
+To run the unit tests provided by the package you can do
 
-ADTTMP=`mktemp -d /tmp/r-cran-qtl-test.XXXXXX`
-cd $ADTTMP
-cp /usr/share/doc/r-cran-qtl/tests/* .
-gunzip *.gz
-for qtltest in `ls *.R` ; do
-    R --no-save < $qtltest
-done
+   sh  run-unit-test
 
+in this directory.

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/changelog	2014-06-23 07:14:08 UTC (rev 17284)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/changelog	2014-06-23 12:06:38 UTC (rev 17285)
@@ -1,3 +1,10 @@
+qtl (1.32-10-1) unstable; urgency=medium
+
+  * New upstream version
+  * Adapt autopkgtest to be similar to other test scripts
+
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Jun 2014 13:35:41 +0200
+
 qtl (1.30-4-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/control	2014-06-23 07:14:08 UTC (rev 17284)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/control	2014-06-23 12:06:38 UTC (rev 17285)
@@ -3,7 +3,7 @@
 Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: gnu-r
-XS-Testsuite: autopkgtest
+Testsuite: autopkgtest
 Priority: optional
 Build-Depends: debhelper (>= 9),
                cdbs,

Modified: trunk/packages/R/r-cran-qtl/trunk/debian/docs
===================================================================
--- trunk/packages/R/r-cran-qtl/trunk/debian/docs	2014-06-23 07:14:08 UTC (rev 17284)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/docs	2014-06-23 12:06:38 UTC (rev 17285)
@@ -1 +1,2 @@
 debian/README.test
+debian/tests/run-unit-test

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	2014-06-23 07:14:08 UTC (rev 17284)
+++ trunk/packages/R/r-cran-qtl/trunk/debian/tests/run-unit-test	2014-06-23 12:06:38 UTC (rev 17285)
@@ -1,11 +1,19 @@
 #!/bin/sh -e
 
+pkg=r-cran-qtl
 if [ "$ADTTMP" = "" ] ; then
-  ADTTMP=`mktemp -d /tmp/r-cran-qtl-test.XXXXXX`
+  ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
 cd $ADTTMP
-cp /usr/share/doc/r-cran-qtl/tests/* $ADTTMP
-gunzip *.gz
-for qtltest in `ls *.R` ; do
-    R --no-save < $qtltest
+cp /usr/share/doc/${pkg}/tests/* $ADTTMP
+gunzip -r *.gz
+for runtest in `ls *.R` ; do
+   LC_ALL=C R --no-save < $runtest >/dev/null
+   if [ ! $? ] ; then
+     echo "Test ${runtest} failed"
+     exit 1
+   else
+     echo "Test ${runtest} passed"
+   fi
 done
+rm -rf $ADTTMP/*