faster make test

Makefile

@@ -66,8 +66,8 @@ check-fix:       ## Check if the GAMS code follows the coding etiquette
 	Rscript -e 'invisible(gms::codeCheck(strict = TRUE, interactive = TRUE))'
 
 test:            ## Test if the model compiles and runs without running a full
-                 ## scenario. Tests take about 10 minutes to run.
-	$(info Tests take about 20 minutes to run, please be patient)
+                 ## scenario. Tests take about 15 minutes to run.
+	$(info Tests take about 15 minutes to run, please be patient)
 	@Rscript -e 'testthat::test_dir("tests/testthat")'
 
 test-coupled:    ## Test if the coupling with MAgPIE works. Takes significantly
@@ -81,9 +81,10 @@ test-coupled-slurm: ## test-coupled, but on slurm
 	@sbatch --qos=priority --wrap="make test-coupled" --job-name=test-coupled --mail-type=END --output=test-coupled.log --comment="test-coupled.log"
 
 test-full:       ## Run all tests, including coupling tests and a default
-                 ## REMIND scenario. Takes significantly longer than 10 minutes to run.
+                 ## REMIND scenario. Takes several hours to run.
 	$(info Full tests take more than an hour to run, please be patient)
 	@TESTTHAT_RUN_SLOW=TRUE Rscript -e 'testthat::test_dir("tests/testthat")'
+
 test-validation: ## Run validation tests, requires a full set of runs in the output folder
 	$(info Run validation tests, requires a full set of runs in the output folder)
 	@TESTTHAT_RUN_SLOW=TRUE Rscript -e 'testthat::test_dir("tests/testthat/validation")'	

start_bundle_coupled.R

@@ -182,11 +182,6 @@ if (any(! file.exists(c(path_settings_coupled, path_settings_remind))) ||
   stop("Missing files or directories, see in red above.")
 }
 
-if ("--gamscompile" %in% flags && ! file.exists("input/source_files.log")) {
-  message("\n### Input data missing, need to compile REMIND first (2 min.)\n")
-  system("Rscript start.R config/tests/scenario_config_compile.csv")
-}
-
 ####################################################
 ############## F U N C T I O N S ###################
 ####################################################

tests/testthat/helper_skipIfFast.R

@@ -6,7 +6,7 @@
 # |  Contact: [email protected]
 skipIfFast <- function() {
   if (identical(Sys.getenv("TESTTHAT_RUN_SLOW"), "")) {
-    skip("Not run in default tests, use `make test-full` to run (takes significantly longer than 10 minutes).")
+    skip("Not run in default tests, use `make test-full` to run (takes several hours).")
   }
   else {
     return(invisible(TRUE))

tests/testthat/test_02-compile.R

@@ -6,7 +6,7 @@
 # |  Contact: [email protected]
 test_that("remind compiles", {
   skipIfPreviousFailed()
-  output <- localSystem2("Rscript", c("start.R", "config/tests/scenario_config_compile.csv"))
+  output <- localSystem2("Rscript", c("start.R", "--gamscompile"))
   printIfFailed(output)
   expectSuccessStatus(output)
 })

tests/testthat/test_04-gamscompile.R

@@ -11,7 +11,7 @@ test_that("start.R --gamscompile startgroup=AMT config/scenario_config.csv works
   testthat::with_mocked_bindings({
     skipIfPreviousFailed()
     output <- localSystem2("Rscript",
-                           c("start.R", "--gamscompile", "startgroup=AMT", titletag, csvfile))
+                           c("start.R", "--gamscompile", "startgroup=compileInTests", titletag, csvfile))
     printIfFailed(output)
     expectSuccessStatus(output)
     },