aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2014-05-08 17:24:44 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2014-05-08 17:24:44 +0200
commit2277408aeecd1e14691e725ddd3628bde40c916f (patch)
tree203104a1cdb334193691e9385543ed0d97a9f997
parent6c7a36c090a3ce121dda6ae315fe971c87044fe3 (diff)
Always run tests without rebuilding vignettes
-rw-r--r--GNUmakefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 4511b07f..21a94341 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,10 +22,8 @@ help:
@echo " check-no-vignettes Invoke build without rebuilding vignettes, and then check"
@echo " install Invoke build and then install the result"
@echo " install-no-vignettes Invoke build without rebuilding vignettes and then install the result"
- @echo " test Install a new copy of the package and run it "
- @echo " through the testsuite"
- @echo " test-no-vignettes Invoke build without rebuilding vignettes, and then run it"
- @echo " through the testsuite"
+ @echo " test Install a new copy of the package without vignette rebuilding"
+ @echo " and run it through the testsuite"
@echo ""
@echo "Packaging Tasks"
@echo "---------------"
@@ -64,11 +62,7 @@ check-no-vignettes: build-no-vignettes
cd ..;\
"$(RBIN)/R" CMD check --as-cran --no-tests $(PKGNAME)_$(PKGVERS).tar.gz
-test: install
- cd tests;\
- "$(RBIN)/Rscript" doRUnit.R
-
-test-no-vignettes: install-no-vignettes
+test: install-no-vignettes
cd tests;\
"$(RBIN)/Rscript" doRUnit.R

Contact - Imprint