diff options
| -rw-r--r-- | .Rbuildignore | 7 | ||||
| -rw-r--r-- | GNUmakefile | 18 | ||||
| -rw-r--r-- | log/build.log (renamed from build.log) | 0 | ||||
| -rw-r--r-- | log/check.log (renamed from check.log) | 0 | ||||
| -rw-r--r-- | log/check_dev.log (renamed from check_dev.log) | 0 | ||||
| -rw-r--r-- | log/test.log (renamed from test.log) | 0 | ||||
| -rw-r--r-- | log/test_dev.log (renamed from test_dev.log) | 0 | ||||
| -rw-r--r-- | log/tests_slow.log (renamed from tests_slow.log) | 0 |
8 files changed, 10 insertions, 15 deletions
diff --git a/.Rbuildignore b/.Rbuildignore index 208d9d46..3144040d 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,10 +1,5 @@ ^GNUmakefile$ -^build.log$ -^check.log$ -^check_dev.log$ -^test.log$ -^test_dev.log$ -^tests_slow.log$ +^log/.*.log$ ^test.R$ ^README.html$ ^mkin.Rcheck diff --git a/GNUmakefile b/GNUmakefile index 569e10ea..4ebb9d99 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -41,7 +41,7 @@ $(TGZ): $(pkgfiles) vignettes $(RM) -r vignettes/*.R $(RM) -r vignettes/web_only/*.R $(RM) Rplots.pdf - "$(RBIN)/R" CMD build . 2>&1 | tee build.log + "$(RBIN)/R" CMD build . 2>&1 | tee log/build.log roxygen: "$(RBIN)/Rscript" -e 'devtools::document()' @@ -64,10 +64,10 @@ quickinstall: build-no-vignettes "$(RBIN)/R" CMD INSTALL $(TGZVNR) check: roxygen build - _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check.log + _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee log/check.log devcheck: roxygen build - _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RDEVBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check_dev.log + _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RDEVBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee log/check_dev.log quickcheck: roxygen build-no-vignettes mv $(TGZVNR) $(TGZ) @@ -82,16 +82,16 @@ clean: $(RM) Rplots.pdf test: install - "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test.log - sed -i -e "s/.*\r.*\r//" test.log + "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee log/test.log + sed -i -e "s/.*\r.*\r//" log/test.log devtest: devinstall - "$(RDEVBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test_dev.log - sed -i -e "s/\r.*\r//" test_dev.log + "$(RDEVBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee log/test_dev.log + sed -i -e "s/\r.*\r//" log/test_dev.log slowtests: install - 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 + NOT_CRAN=true "$(RBIN)/Rscript" -e 'cli.dynamic = TRUE); library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee log/tests_slow.log + sed -i -e "s/\r.*\r//" log/tests_slow.log testcheck: roxygen test check diff --git a/build.log b/log/build.log index 5ac21b0d..5ac21b0d 100644 --- a/build.log +++ b/log/build.log diff --git a/check.log b/log/check.log index 8fce3fd1..8fce3fd1 100644 --- a/check.log +++ b/log/check.log diff --git a/check_dev.log b/log/check_dev.log index bd2f319f..bd2f319f 100644 --- a/check_dev.log +++ b/log/check_dev.log diff --git a/test_dev.log b/log/test_dev.log index 24905a1a..24905a1a 100644 --- a/test_dev.log +++ b/log/test_dev.log diff --git a/tests_slow.log b/log/tests_slow.log index b5b646b6..b5b646b6 100644 --- a/tests_slow.log +++ b/log/tests_slow.log |