diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-07-15 14:11:25 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-07-15 14:16:29 +0200 |
| commit | 39b0b93b5d15a3a0e9126f29c753e2fef75dc701 (patch) | |
| tree | fcb5527b86595b7c077cb574aecc62ff99a26e26 /GNUmakefile | |
| parent | 9f8e1eb33b586beb7e889212bdababa081b6ff67 (diff) | |
Improve tests
- Reduce significant digits for the objective function output in
mkinfit(..., quiet = FALSE) as R and R-devel gave different output on my
system
- Add makefile target 'devtest' for testing with R-devel, in order
to fix problems showing up with R-devel on Travis
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 8108704a..1adac4e0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -10,7 +10,7 @@ WINBIN := $(PKGSRC)_$(PKGVERS).zip # If no alternate bin folder is specified, the default is to use the folder # containing the first instance of R on the PATH. RBIN ?= $(shell dirname "`which R`") -#RBIN=/home/jranke/svn/R/r-devel/build/bin +RDEVBIN=/home/jranke/svn/R/r-devel/build/bin # Specify package and static documentation directories for subversion on r-forge RFSVN ?= $(HOME)/svn/r-forge/kinfit @@ -78,12 +78,16 @@ test: install "$(RBIN)/Rscript" -e '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 + sed -i -e "s/\r.*\r//" test.log + slowtests: install NOT_CRAN=true "$(RBIN)/Rscript" -e 'library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee tests_slow.log sed -i -e "s/\r.*\r//" tests_slow.log vdiffr: - /home/jranke/svn/R/r-devel/build/bin/Rscript -e 'vdiffr::manage_cases(filter = "plot|nafta")' + "$(RDEVBIN)/Rscript" -e 'vdiffr::manage_cases(filter = "plot|nafta")' testcheck: test check |