diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30f77f2baf8cea0d93eef3dd62febb0673bb5cfe..8520102078678e4dd957ecb2e5fd182f2f616cae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,16 +33,14 @@ default: .regression: stage: regression -# only: -# refs: -# - schedules variables: NOT_CRAN: "true" script: - Rscript -e 'source("tests/testthat/store_examples.R"); StoreRefExampleResults("airGR");' - R CMD INSTALL . - Rscript -e 'source("tests/testthat/store_examples.R"); StoreTestExampleResults("airGR");' - - Rscript -e 'res <- testthat::test_file("tests/testthat/test-regression.R"); dRes = as.data.frame(res); if(any(dRes[,"failed"]>0) | any(dRes[,"error"])) {quit(status = 1)};' + - ls -l tests/tmp + - Rscript -e 'Sys.setenv(NOT_CRAN="true"); setwd("tests/testthat"); res <- testthat::test_file("test-regression.R"); dRes = as.data.frame(res); if(any(dRes[,"failed"]>0) | any(dRes[,"error"])) {quit(status = 1)};' .check_not_cran: stage: tests @@ -72,11 +70,17 @@ regression_patched: extends: .regression regression_devel: + only: + refs: + - schedules variables: R_VERSION: "devel" extends: .regression regression_oldrel: + only: + refs: + - schedules variables: R_VERSION: "oldrel" extends: .regression diff --git a/tests/testthat/test-regression.R b/tests/testthat/test-regression.R index 432c561d644017d382aaacbd66b3753a54a33ec8..c00f3d6e5bdbc18e2802410e7afd72480d625d99 100644 --- a/tests/testthat/test-regression.R +++ b/tests/testthat/test-regression.R @@ -19,10 +19,10 @@ CompareWithRef <- function(refVarFile, testDir, regIgnore) { }) } } - +print(getwd()) if (dir.exists("../tmp/ref") & dir.exists("../tmp/test")) { refVarFiles <- list.files("../tmp/ref", recursive = TRUE, full.names = TRUE) - regIgnoreFile <- "../../.regressionignore2" + regIgnoreFile <- "../../.regressionignore" if (file.exists(regIgnoreFile)) { regIgnore <- read.table(file = regIgnoreFile, sep = " ", header = FALSE, skip = 5,