restore tests based on RCPP environment variable

jjallaire · jjallaire · commit 856492d62d42 · 2014-08-14T09:38:32.000-07:00
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -3,5 +3,6 @@
 ^src/tbb/build/lib_.*$
 ^inst/lib$
 ^.travis.yml
+^tests
 
 
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -9,7 +9,6 @@ Description: High level functions for doing parallel programming with Rcpp.
   For example, the parallelFor function can be used to convert the work of 
   a standard serial "for" loop into a parallel one and the parallelReduce 
   function can be used for accumulating aggregate or other values.
-Suggests: Rcpp, testthat
 SystemRequirements: GNU make
 License: GPL-2
 Collate: 
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,7 +1,17 @@
 require(methods)
 require(RcppParallel)
 require(testthat)
-require(Rcpp)
+
+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")
 
