From ab6a5ebd41ed0067c52c7e1c471f2878735c53a2 Mon Sep 17 00:00:00 2001 From: Jamie Lentin Date: Thu, 4 Jul 2024 12:30:45 +0000 Subject: [PATCH] vignettes: Don't set work_dir in CMD check --- R/test_utils.R | 1 + vignettes/introduction-single-stock.Rmd | 2 +- vignettes/multiple-substocks.Rmd | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/R/test_utils.R b/R/test_utils.R index f18f84c9..163000ae 100644 --- a/R/test_utils.R +++ b/R/test_utils.R @@ -117,6 +117,7 @@ ut_cmp_df <- function (df, table_text, ...) { } vignette_base_dir <- function (extra) { + writeLines(c("Vignette current directory:", getwd()), con = stderr()) if (basename(getwd()) == "vignettes") { out <- file.path("..", "baseline") } else if (basename(getwd()) == "gadget3") { diff --git a/vignettes/introduction-single-stock.Rmd b/vignettes/introduction-single-stock.Rmd index 0b929780..fb7bbae9 100644 --- a/vignettes/introduction-single-stock.Rmd +++ b/vignettes/introduction-single-stock.Rmd @@ -25,7 +25,7 @@ vignette: > library(unittest) # Redirect ok() output to stderr options(unittest.output = stderr()) -options(gadget3.tmb.work_dir = gadget3:::vignette_base_dir('work_dir')) +if (nzchar(Sys.getenv('G3_TEST_TMB'))) options(gadget3.tmb.work_dir = gadget3:::vignette_base_dir('work_dir')) library(gadget3) set.seed(123) diff --git a/vignettes/multiple-substocks.Rmd b/vignettes/multiple-substocks.Rmd index e6457991..819bb170 100644 --- a/vignettes/multiple-substocks.Rmd +++ b/vignettes/multiple-substocks.Rmd @@ -21,7 +21,7 @@ vignette: > library(unittest) # Redirect ok() output to stderr options(unittest.output = stderr()) -options(gadget3.tmb.work_dir = gadget3:::vignette_base_dir('work_dir')) +if (nzchar(Sys.getenv('G3_TEST_TMB'))) options(gadget3.tmb.work_dir = gadget3:::vignette_base_dir('work_dir')) library(gadget3) set.seed(123)