[rkward-cvs] SF.net SVN: rkward:[3678] trunk/rkward/rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 3678
          http://rkward.svn.sourceforge.net/rkward/?rev=3678&view=rev
Author:   tfry
Date:     2011-06-06 13:46:27 +0000 (Mon, 06 Jun 2011)

Log Message:
-----------
Fix problem with capturing output during automated tests.

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rkrbackend.cpp
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2011-06-06 12:31:58 UTC (rev 3677)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2011-06-06 13:46:27 UTC (rev 3678)
@@ -1370,6 +1370,10 @@
 		request.params["call"] = dummy;
 	} else if (parameters.value (0) == "set.output.file") {
 		output_file = parameters.value (1);
+		if (parameters.length () > 2) {
+			RK_ASSERT (parameters.value (2) == "SILENT");
+			return QStringList ();		// For automated testing. The frontend should not be notified, here
+		}
 		request.params["call"] = parameters;
 	} else {
 		request.params["call"] = parameters;

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R	2011-06-06 12:31:58 UTC (rev 3677)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R	2011-06-06 13:46:27 UTC (rev 3678)
@@ -211,6 +211,7 @@
 	rktest.replace ("rk.set.output.html.file", function (x) {
 		stopifnot(is.character(x))
 		assign(".rk.output.html.file", x, as.environment("package:rkward"))
+		.rk.do.plain.call ("set.output.file", c (x, "SILENT"), synchronous=FALSE)
 	})
 	assign("initialized", TRUE, envir=.rktest.tmp.storage)
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.