try to get tests so they can run on CRAN (not there yet)

jjallaire · jjallaire · commit c4d9302643ad · 2015-03-04T17:46:29.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,8 @@ before_install:
   - chmod 755 ./travis-tool.sh
   - ./travis-tool.sh bootstrap
   - ./travis-tool.sh github_package hadley/testthat
-  - if [ "$RCPP" = "Rcpp" ]; then ./travis-tool.sh github_package RcppCore/Rcpp; fi
-  - if [ "$RCPP" = "Rcpp11" ]; then ./travis-tool.sh github_package Rcpp11/Rcpp11; ./travis-tool.sh github_package Rcpp11/attributes; fi
- 
+  - ./travis-tool.sh github_package RcppCore/Rcpp
+
 script: 
   - R CMD INSTALL .
   - cd tests
@@ -18,6 +17,4 @@ notifications:
     on_success: change
     on_failure: change
 
-env:
-  - RCPP=Rcpp
-  - RCPP=Rcpp11
+
diff --git a/man/setThreadOptions.Rd b/man/setThreadOptions.Rd
@@ -39,10 +39,10 @@ defaultNumThreads()
 }
 
 \examples{
-\dontrun{
+library(RcppParallel)
+
 setThreadOptions(numThreads = 4)
 
 defaultNumThreads()
 }
-}
 
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,17 +1,7 @@
-require(methods)
-require(RcppParallel)
-require(testthat)
+library(testthat)
+library(Rcpp)
+library(RcppParallel)
 
-RCPP <- Sys.getenv( "RCPP" )
-if( RCPP == "Rcpp" ){
-  message( "testing against Rcpp" ) 
-  require(Rcpp)  
-} else if( RCPP == "Rcpp11" ){
-  message( "testing against Rcpp11" ) 
-  require(attributes)  
-} else {
-  stop( "Rcpp implementation not setup, please set the $RCPP environment variable" )  
-}
 
-test_dir("testthat")
+test_check("RcppParallel")
 

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ defaultNumThreads()`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`\examples{`
`42`		`-\dontrun{`
	`42`	`+library(RcppParallel)`
	`43`	`+`
`43`	`44`	`setThreadOptions(numThreads = 4)`
`44`	`45`
`45`	`46`	`defaultNumThreads()`
`46`	`47`	`}`
`47`		`-}`
`48`	`48`