From 9ed4aa365d780149f5595d6d641765facebfb714 Mon Sep 17 00:00:00 2001
From: Lars Langhans <lla@openoffice.org>
Date: Mon, 14 Jun 2010 13:42:10 +0200
Subject: sb123:#i111449# make it possible to suppress output

---
 qadevOOo/runner/helper/ProcessHandler.java | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'qadevOOo/runner')

diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index c414accd44ac..519c7473a50f 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -33,10 +33,12 @@ import java.io.PrintStream;
 import java.io.LineNumberReader;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import lib.TestParameters;
+import share.LogWriter;
 import util.PropertyName;
 import util.utils;
 
@@ -58,6 +60,7 @@ class Pump extends Thread
     private String pref;
     private StringBuffer buf = new StringBuffer(256);
     private PrintWriter log;
+    private boolean bOutput;
 
     /**
      * Creates Pump for specified <code>InputStream</code>.
@@ -70,11 +73,12 @@ class Pump extends Thread
      * @param outPrefix A prefix which is printed at the
      *   beginning of each output line.
      */
-    public Pump(InputStream is, PrintWriter log, String outPrefix)
+    public Pump(InputStream is, PrintWriter log, String outPrefix, boolean _bOutput)
     {
         this.pref = (outPrefix == null) ? "" : outPrefix;
         reader = new LineNumberReader(new InputStreamReader(is));
         this.log = log;
+        this.bOutput = _bOutput;
         start();
     }
 
@@ -85,8 +89,11 @@ class Pump extends Thread
             String line = reader.readLine();
             while (line != null)
             {
-                log.println(pref + line);
-                log.flush();
+                if (bOutput)
+                {
+                    log.println(pref + line);
+                    log.flush();
+                }
                 buf.append(line).append('\n');
                 line = reader.readLine();
             }
@@ -134,6 +141,8 @@ public class ProcessHandler
     private TestParameters param = null;
     private boolean debug = false;
 
+    private boolean bUseOutput = true;
+
     /**
      * Creates instance with specified external command.
      * Debug info and output
@@ -566,8 +575,8 @@ public class ProcessHandler
             return;
         }
         dbg("execute: pump io-streams");
-        stdout = new Pump(m_aProcess.getInputStream(), log, "out > ");
-        stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ");
+        stdout = new Pump(m_aProcess.getInputStream(), log, "out > ", bUseOutput);
+        stderr = new Pump(m_aProcess.getErrorStream(), log, "err > ", bUseOutput);
         stdIn = new PrintStream(m_aProcess.getOutputStream());
 
         // int nExitValue = m_aProcess.exitValue();
@@ -821,4 +830,10 @@ public class ProcessHandler
             log.println(utils.getDateTime() + "PH." + message);
         }
     }
+
+    public void noOutput()
+    {
+        bUseOutput = false;
+    }
+
 }
-- 
cgit 


From 17b14f450781702952505250bebe814695103810 Mon Sep 17 00:00:00 2001
From: Lars Langhans <lla@openoffice.org>
Date: Thu, 1 Jul 2010 10:20:05 +0200
Subject: sb123:#i111449# update version

---
 qadevOOo/runner/org/openoffice/Runner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qadevOOo/runner')

diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index a3741774917e..41f96a4d384e 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -184,7 +184,7 @@ public class Runner
 
     public static boolean run(String... args)
     {
-        System.out.println("OOoRunner Main() version from 20100323 (yyyymmdd)");
+        System.out.println("OOoRunner Main() version from 20100630 (yyyymmdd)");
 
         setStartTime(getTime());
 
-- 
cgit