From cf5cac4c98169b235df0ae391d6568a7214b9ab9 Mon Sep 17 00:00:00 2001
From: Dorchies David <david.dorchies@irstea.fr>
Date: Mon, 23 Nov 2020 20:17:03 +0100
Subject: [PATCH] ci: move regression_tests.R to testthat subdirectory to avoid
execution by `R CMD CHECK`
Refs #69
---
.gitlab-ci.yml | 7 ++++---
tests/testthat/helper_regression.R | 1 -
tests/testthat/regression.R | 6 +++---
tests/{ => testthat}/regression_tests.R | 0
4 files changed, 7 insertions(+), 7 deletions(-)
rename tests/{ => testthat}/regression_tests.R (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae80f182..599ec847 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 cbcbfecc..cbcf9dbf 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 eceecf12..2ccadba4 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
--
GitLab