From 2b06ba5be233f5b88a3a64f7de916ed476326067 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 10 Feb 2022 09:14:59 +0100 Subject: GNUMakefile: Convince testthat to give dynamic output This means that we still get the \r in the test logs so so the postprocessing with sed works unmodified --- GNUmakefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 5f2b9bda..7052bc01 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -79,16 +79,15 @@ clean: $(RM) Rplots.pdf test: install - "$(RBIN)/Rscript" -e 'devtools::test()' 2>&1 | tee test.log - # The following does not have the desired effect with current testthat - sed -i -e "s/\r.*\r//" test.log + "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test.log + sed -i -e "s/.*\r.*\r//" test.log devtest: install - "$(RDEVBIN)/Rscript" -e 'devtools::test()' 2>&1 | tee test_dev.log + "$(RDEVBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test_dev.log sed -i -e "s/\r.*\r//" test_dev.log slowtests: install - NOT_CRAN=true "$(RBIN)/Rscript" -e 'library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee tests_slow.log + NOT_CRAN=true "$(RBIN)/Rscript" -e 'cli.dynamic = TRUE); library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee tests_slow.log sed -i -e "s/\r.*\r//" tests_slow.log testcheck: roxygen test check -- cgit v1.2.1