[Pomp-commits] r1221 - pkg

[noreply at r-forge.r-project.org]

Author: kingaa
Date: 2015-06-18 13:56:46 +0200 (Thu, 18 Jun 2015)
New Revision: 1221

Modified:
   pkg/Makefile
Log:
- put in valgrind check as .xcheck target

Modified: pkg/Makefile
===================================================================
--- pkg/Makefile	2015-06-18 11:56:44 UTC (rev 1220)
+++ pkg/Makefile	2015-06-18 11:56:46 UTC (rev 1221)
@@ -37,6 +37,7 @@
 %.crancheck: export R_PROFILE_USER=./Rprofile
 %.crancheck: export R_PROFILE_USER=$(CURDIR)/Rprofile
 %.vignettes %.data: export R_LIBS=$(CURDIR)/library
+%.xcheck: export R_LIBS=$(CURDIR)/check
 %.bin %.check %.qcheck %.qqcheck %.xcheck %.crancheck %.upload %.publish %.clean %.install %.win: PKG = $*_$(shell perl -ne 'print $$1 if /Version:\s+(\d+\.\d+-\d+)/;' $*/DESCRIPTION)
 
 pomp.vignettes: pomp.install pomp.manual
@@ -73,9 +74,9 @@
 	$(RM) -r cran/$*/tests 
 	$(TOUCH) $@
 
-%.xcheck: %.dist
+%.xcheck: %.check
 	mkdir -p check
-	$(RCMD) check --use-gct --use-valgrind --timings --library=check $(PKG).tar.gz
+	$(REXE) -d "valgrind --tool=memcheck --track-origins=yes --leak-check=full" < $*.Rcheck/$*-Ex.R
 	$(TOUCH) $@
 
 %.check: %.dist
@@ -113,7 +114,7 @@
 	$(TOUCH) $@
 
 %.clean: clean
-	$(RM) $*.dist $*.check $*.qcheck $*.qqcheck $*.crancheck $*.manual $*.cransrc
+	$(RM) $*.dist $*.check $*.qcheck $*.qqcheck $*.xcheck $*.crancheck $*.manual $*.cransrc
 	$(RM) -r $*.Rcheck check/$* cran/$*
 	$(RM) $*/src/*.o $*/src/*.so $*/src/symbols.rds $*/vignettes/Rplots.*
 	$(RM) $(PKG).tar.gz $(PKG).zip $*.pdf