From cf5fcd0a9b7d66359aa4f00b06ba783199136cfc Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 7 May 2016 23:50:11 +0100 Subject: [PATCH] Display output when running the R examples Running 'make check-r-examples' is quiet like the other examples and running 'make check-r-examples RUNPIPE=' will display the examples output like the other languages. The output displayed when running each example in its own particular directory. The output is less than what was previously in the .Rout file as -q --slave is used. --- Examples/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 7fb163629..917e678ae 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1671,6 +1671,7 @@ R = R RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system as it does not understand _wrap.cxx RRSRC = $(INTERFACE:.i=.R) R_CFLAGS=-fPIC +R_OPT = --slave --quiet --no-save --no-restore R_SCRIPT=$(SRCDIR)$(RUNME).R # need to compile .cxx files outside of R build system to make sure that @@ -1703,7 +1704,7 @@ endif # ----------------------------------------------------------------- r_run: - $(RUNTOOL) $(R) CMD BATCH $(R_SCRIPT) $(RUNPIPE) + $(RUNTOOL) $(R) $(R_OPT) -f $(R_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display