From 01c69fcff8c5a82b4c80faaeb44ff00827e792ca Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 14 May 2015 00:21:12 +0200 Subject: Start of migration from RUnit to testthat --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 126dede1..b731166b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -18,13 +18,13 @@ SDDIR ?= $(RFSVN)/www/mkin_static pkgfiles = NEWS \ data/* \ DESCRIPTION \ - inst/unitTests* \ inst/staticdocs/README \ man/* \ NAMESPACE \ R/* \ README.md \ tests/* \ + tests/testthat* \ TODO \ vignettes/* @@ -69,7 +69,7 @@ clean: test: install-no-vignettes cd tests;\ - "$(RBIN)/Rscript" doRUnit.R + "$(RBIN)/Rscript" testthat.R vignettes/mkin.pdf: vignettes/mkin.Rnw "$(RBIN)/Rscript" -e "tools::buildVignette(file = 'vignettes/mkin.Rnw', dir = 'vignettes')" -- cgit v1.2.1 From 656466946f093617ababebe5ec3b36809234112a Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 15 May 2015 08:49:40 +0200 Subject: Finished migration from RUnit to testthat --- GNUmakefile | 1 + 1 file changed, 1 insertion(+) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index b731166b..783ceb14 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -104,5 +104,6 @@ winbuilder: build submit: @echo "\nHow about make test, make check, make winbuilder and make r-forge?" @echo "\nIs the DESCRIPTION file up to date?" + @echo "\nIs the NEWS.md file up to date?" @echo "\nAre you sure you want to release to CRAN?" @echo "\nThen use the form at http://cran.r-project.org/submit.html" -- cgit v1.2.1 From fcc28ed8bafd5c3b989033e8f1afefaae0c3fe41 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 15 May 2015 11:13:19 +0200 Subject: Better description of the release procedure --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 783ceb14..979caca9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -102,8 +102,8 @@ winbuilder: build curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ submit: - @echo "\nHow about make test, make check, make winbuilder and make r-forge?" + @echo "\nHow about make test, make check, make winbuilder" @echo "\nIs the DESCRIPTION file up to date?" @echo "\nIs the NEWS.md file up to date?" @echo "\nAre you sure you want to release to CRAN?" - @echo "\nThen use the form at http://cran.r-project.org/submit.html" + @echo "\nThen make r-forge, commit leftover changes if any, tag the release and use the form at http://cran.r-project.org/submit.html" -- cgit v1.2.1