Bugfix/travis (#954)

* always set test running environment variable on Travis

* set env var for R in ci Dockerfile via ENV

Author: eddelbuettel

ChangeLog

@@ -2,6 +2,10 @@
 
 	* DESCRIPTION (Version, Date): Roll minor version
 
+	* tests/doRUnit.R: On Travis always set RunAllRcppTests
+
+	* docker/ci/Dockerfile: Set environment variables container-wide
+
 2019-03-18  Dirk Eddelbuettel  <[email protected]>
 
 	* inst/include/Rcpp/macros/macros.h (END_RCPP_RETURN_ERROR): Add

docker/ci/Dockerfile

@@ -19,9 +19,9 @@ RUN apt-get update \
                 r-cran-lazyeval \
                 r-cran-withr \
                 git \
-        && install.r rbenchmark pinp covr \
-        && mkdir ~/.R \
-        && echo _R_CHECK_FORCE_SUGGESTS_=FALSE > ~/.R/check.Renviron \
-        && echo RunAllRcppTests=yes >> ~/.R/check.Renviron
+        && install.r rbenchmark pinp covr
+
+ENV _R_CHECK_FORCE_SUGGESTS_ FALSE
+ENV RunAllRcppTests yes
 
 CMD ["bash"]

tests/doRUnit.R

@@ -43,7 +43,7 @@ if (requireNamespace("RUnit", quietly=TRUE) &&
 
     Sys.setenv("R_TESTS"="")    		# without this, we get (or used to get) unit test failures
 
-    ## force tests to be executed if in dev release which we define as
+    ## Force tests to be executed if in dev release which we define as
     ## having a sub-release, eg 0.9.15.5 is one whereas 0.9.16 is not
     if (length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) {	# dev release, and
         if (Sys.getenv("RunAllRcppTests") != "no") { 				# if env.var not yet set
@@ -52,6 +52,14 @@ if (requireNamespace("RUnit", quietly=TRUE) &&
         }
     }
 
+    ## On Travis also always set tests; see
+    ## https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    if ((Sys.getenv("CI") == "true") || (Sys.getenv("TRAVIS") == "true") ||
+        (Sys.getenv("CONTINUOUS_INTEGRATION") == "true")) {
+            message("Always enabling \"RunAllRcppTests\"=\"yes\" on Travis\n")
+            Sys.setenv("RunAllRcppTests"="yes")
+    }
+
     tests <- runTestSuite(testSuite)	# Run tests
 
     printTextProtocol(tests)			# Print results