diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae80f182dcf3872ce8b4c1cfb192d3614e8cd4e1..599ec847b10e5b32ad7701752284926fa025ca7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,9 +34,10 @@ default: .regression: stage: regression script: - - Rscript tests/regression_tests.R stable - - Rscript tests/regression_tests.R dev - - Rscript tests/regression_tests.R compare + - Rscript tests/testthat/regression_tests.R stable + - R CMD INSTALL . + - Rscript tests/testthat/regression_tests.R dev + - Rscript tests/testthat/regression_tests.R compare .check_not_cran: stage: tests diff --git a/tests/testthat/helper_regression.R b/tests/testthat/helper_regression.R index cbcbfeccc3859243dfa31a2fb0c25c9649d483fd..cbcf9dbfee09f0309b429ad54636123ba988a34a 100644 --- a/tests/testthat/helper_regression.R +++ b/tests/testthat/helper_regression.R @@ -10,7 +10,6 @@ StoreDevExampleResults <- function( package = "airGR", path = file.path("tests/tmp", Sys.getenv("R_VERSION"), "dev"), ...) { - devtools::install() StoreExampleResults(package = package, path = path, ...) } diff --git a/tests/testthat/regression.R b/tests/testthat/regression.R index eceecf120b4adf9627c3745e92b94a6f1cf3e395..2ccadba442cf1ab03b3834b7e28a6533e60f21b7 100644 --- a/tests/testthat/regression.R +++ b/tests/testthat/regression.R @@ -38,7 +38,7 @@ if (dir.exists(file.path(tmp_path, "stable")) & dir.exists(file.path(tmp_path, " lapply(X = refVarFiles, CompareWithStable, testDir = file.path(tmp_path, "dev"), regIgnore = regIgnore) } else { stop("Regression tests compared to released version needs that you run the following instructions first:\n", - "Rscript -e 'source(\"tests/testthat/store_examples.R\"); StoreStableExampleResults(\"airGR\");'\n", - "R CMD INSTALL .\n", - "Rscript -e 'source(\"tests/testthat/store_examples.R\"); StoreDevExampleResults(\"airGR\");'\n") + "Rscript tests/testthat/regression_tests.R stable\n", + "R CMD INSTALL .\n", + "Rscript tests/testthat/regression_tests.R dev") } diff --git a/tests/regression_tests.R b/tests/testthat/regression_tests.R similarity index 100% rename from tests/regression_tests.R rename to tests/testthat/regression_tests.R