diff --git a/R/envopts.R b/R/envopts.R index 4cf735bca87be2f8f3238d3da16ef8e5278cae4c..2fe0ff45bb061c7e799f05472742896fa9068dbf 100644 --- a/R/envopts.R +++ b/R/envopts.R @@ -89,7 +89,7 @@ seal_envopts <- function(o) { if (is.null(o$metfrag$java_bin)) o$metfrag$java_bin=Sys.which("java") if (is.null(o$metfrag$jar)) o$metfrag$jar = "" if (is.null(o$metfrag$max_proc)) o$metfrag$max_proc = parallel::detectCores() - + if (is.null(o$no_structure_plots)) o$no_structure_plots = F check_dir_absent(o$projects,what="projects-dir") o$projects = norm_path(o$projects) diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R index aa1701cfaa8cd41e51b5bccd2fe6d30a1f4d1482..3b75d674d09bd2670e40cfd2e8a69b13976537aa 100644 --- a/tests/testthat/helper.R +++ b/tests/testthat/helper.R @@ -81,7 +81,7 @@ envopts_from_dirs <- function(dirs) { trim_tmp_paths_envopts <- function(x) { y=list() - for (n in setdiff(names(x),"metfrag")) { + for (n in setdiff(names(x),c("metfrag","no_structure_plots"))) { y[[n]] = basename(x[[n]]) } @@ -90,6 +90,7 @@ trim_tmp_paths_envopts <- function(x) { y$metfrag[[n]]=basename(x$metfrag[[n]]) } y$metfrag$max_proc = x$metfrag$max_proc + y$no_structure_plots = y$no_structure_plots y } diff --git a/tests/testthat/test-api.R b/tests/testthat/test-api.R index b7a2b16f0e9c76ff5d97d7a189a86aaad1ab8068..fd1926742bb41e3b49834e7324f220c3f2cae57e 100644 --- a/tests/testthat/test-api.R +++ b/tests/testthat/test-api.R @@ -9,9 +9,10 @@ test_that("Test basic initialisation.",{ metfrag_jar = file.path(dirs$mfjardir,"metfrag.jar"), java_bin = file.path(dirs$mfjardir,"java"), metfrag_max_proc=3L, + no_structure_plots=F, merge=F, save=F) - + ## Function `gen_test_dirs' creates shinyscreen root structure in ## a temp dir. We need to strip the random part for comparison. y = trim_tmp_paths_envopts(x)