Merge branch 'master' of github.com:RcppCore/RcppParallel

Author: jjallaire

.Rbuildignore

@@ -1,8 +1,11 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^src/tbb/build/lib_.*$
+^tests/testthat/pkg/RcppParallelTest/src/.*\.s?o$
+^tests/testthat/pkg/RcppParallelTest/src/.*\.dll$
 ^inst/lib$
 ^.travis.yml
+^README.md
 ^doc$
 
 

NEWS

@@ -1,9 +1,8 @@
 RcppParallel 4.3.7
 ------------------------------------------------------------------------
 
-* Fix failure to compile with Rtools 3.3
-* Fix failure to compile on OS X Snow Leopard R toolchain
 * Add tbbmalloc library
+* Fix failure to compile on OS X Snow Leopard R toolchain
 
 RcppParallel 4.3.6
 ------------------------------------------------------------------------

tests/testthat/test-malloc.R

@@ -1,6 +1,9 @@
 context( "malloc" )
 
 test_that( "tbbmalloc works", {
+    
+    skip_on_cran()
+   
     sourceCpp( "cpp/malloc.cpp" )
 })
 

tests/testthat/test-pkg.R

@@ -2,6 +2,8 @@ context( "package" )
 
 test_that( "linking from a package works", {
 
+   skip_on_cran()
+   
    templib <- tempfile()
    dir.create(templib)