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

[Andreas Tille]

Author: tille
Date: 2014-06-30 13:45:48 +0000 (Mon, 30 Jun 2014)
New Revision: 17366

Modified:
   trunk/packages/R/r-cran-dosefinding/trunk/debian/README.test
   trunk/packages/R/r-cran-dosefinding/trunk/debian/changelog
   trunk/packages/R/r-cran-dosefinding/trunk/debian/control
   trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/control
   trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/run-unit-test
Log:
Recommends: r-cran-rsolnp, r-cran-multcomp since these are used in test suite


Modified: trunk/packages/R/r-cran-dosefinding/trunk/debian/README.test
===================================================================
--- trunk/packages/R/r-cran-dosefinding/trunk/debian/README.test	2014-06-30 13:42:07 UTC (rev 17365)
+++ trunk/packages/R/r-cran-dosefinding/trunk/debian/README.test	2014-06-30 13:45:48 UTC (rev 17366)
@@ -5,4 +5,8 @@
 
    sh  run-unit-test
 
-in this directory.
+in this directory.  Make sure you have installed the recommended
+packages r-cran-rsolnp and r-cran-multcomp before running this test.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 30 Jun 2014 15:18:28 +0200
+

Modified: trunk/packages/R/r-cran-dosefinding/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-dosefinding/trunk/debian/changelog	2014-06-30 13:42:07 UTC (rev 17365)
+++ trunk/packages/R/r-cran-dosefinding/trunk/debian/changelog	2014-06-30 13:45:48 UTC (rev 17366)
@@ -1,12 +1,12 @@
-r-cran-dosefinding (0.9-11-1) UNRELEASED; urgency=medium
+r-cran-dosefinding (0.9-11-1) unstable; urgency=medium
 
   * New upstream version
   * cme fix dpkg-control
   * add autopkgtest
-  TODO: Test suite needs
-    svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-rsolnp/trunk/
+  * Recommends: r-cran-rsolnp, r-cran-multcomp since these are used in
+    test suite
 
- -- Andreas Tille <tille at debian.org>  Thu, 19 Jun 2014 23:19:23 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 30 Jun 2014 15:18:28 +0200
 
 r-cran-dosefinding (0.9-9-1) unstable; urgency=low
 

Modified: trunk/packages/R/r-cran-dosefinding/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-dosefinding/trunk/debian/control	2014-06-30 13:42:07 UTC (rev 17365)
+++ trunk/packages/R/r-cran-dosefinding/trunk/debian/control	2014-06-30 13:45:48 UTC (rev 17366)
@@ -20,6 +20,8 @@
          ${R:Depends},
          r-cran-lattice,
          r-cran-mvtnorm
+Recommends: r-cran-rsolnp,
+            r-cran-multcomp
 Description: Planning and Analyzing Dose Finding experiments
  The DoseFinding GNU R package provides functions for the design and
  analysis of dose-finding experiments (with focus on pharmaceutical Phase

Modified: trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/control
===================================================================
--- trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/control	2014-06-30 13:42:07 UTC (rev 17365)
+++ trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/control	2014-06-30 13:45:48 UTC (rev 17366)
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, r-cran-runit
+Depends: @, r-cran-runit, r-cran-rsolnp, r-cran-multcomp
 Restrictions: allow-stderr

Modified: trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/run-unit-test
===================================================================
--- trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/run-unit-test	2014-06-30 13:42:07 UTC (rev 17365)
+++ trunk/packages/R/r-cran-dosefinding/trunk/debian/tests/run-unit-test	2014-06-30 13:45:48 UTC (rev 17366)
@@ -7,13 +7,11 @@
 cd $ADTTMP
 cp /usr/share/doc/${pkg}/tests/* $ADTTMP
 gunzip *.gz
-ls *.R
-set -x
-for runtest in `ls *.R` ; do
+for runtest in *.R ; do
     if [ "$runtest" = "testsplotDRMod.R" ] ; then
        echo "$runtest consists only from comments and returns non-zero exit value ... ignored"
     else
-       R --no-save < $runtest # > /dev/null
+       R CMD BATCH $runtest
        RET=$?
        if [ $RET -eq 0 ] ; then
            echo $runtest passed