diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-11-26 12:04:07 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-26 12:04:07 +0000 |
commit | bea64d38467c56cf4d4bfabd7a75a42d6665b55b (patch) | |
tree | d324e2a56c36a30b1f541e8ac799d87c1403f527 /qadevOOo/runner/helper/ProcessHandler.java | |
parent | 9709a39d5b8d6e7f36d4c478f2fcf2386abd505d (diff) |
CWS-TOOLING: integrate CWS qadev34
2008-11-24 12:04:37 +0100 cn r264220 : #i96037 bugfix: remove superfluous exclamation mark
2008-11-20 20:52:21 +0100 cn r264100 : #i95964 fixes for cygwin
2008-11-20 12:10:41 +0100 cn r264040 : #i95964 replacesment for cwsquery modules
2008-11-10 10:29:48 +0100 cn r263511 : #i96037 register installoffice.oxt
2008-11-07 15:44:58 +0100 cn r263423 : #i95964# changes for 'cwstouched' wihch is a replacemant for 'cwsquery modules'
2008-10-31 14:04:47 +0100 cn r262866 : #i95303# add XDEBUG variable
2008-10-31 14:03:39 +0100 cn r262865 : #i95610# update lists
2008-10-31 09:47:27 +0100 cn r262855 : #i95303# bugfix
2008-10-31 09:47:06 +0100 cn r262854 : #i95303# bugfix
2008-10-30 21:42:14 +0100 cn r262837 : #i95204 remove -OOO_EnvSet parameter
2008-10-30 21:33:18 +0100 cn r262836 : #i95304 add -enableautomation as soffice parameter
2008-10-30 10:20:24 +0100 cn r262822 : #i95610 update lists
2008-10-27 22:00:00 +0100 cn r262691 : #i95513#: add support for -runnerini as aditional ini file
2008-10-27 21:35:17 +0100 cn r262690 : #i95513# use -runnerini instead of -ini
2008-10-23 13:41:32 +0200 cn r262621 : #i95303# changes to run cwscheckapi in cygwin environment
2008-10-22 10:18:36 +0200 cn r262581 : #i95304# disable QuckStarter while trying to dispose the office
2008-10-22 09:59:39 +0200 cn r262580 : #i95303# add cygwin related stuff
2008-10-22 09:59:10 +0200 cn r262579 : #i95303# add cygwin related stuff
2008-10-22 09:57:40 +0200 cn r262578 : #i95303# add property CYGWIN
Diffstat (limited to 'qadevOOo/runner/helper/ProcessHandler.java')
-rw-r--r-- | qadevOOo/runner/helper/ProcessHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index af469fdf6442..00da332acf5d 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -301,18 +301,18 @@ public class ProcessHandler { * @param commands * @param log * @param workDir - * @param shortWait If this parameter is ture the <CODE>mTimeOut</CODE> is set to 3000 ms, else it is set to + * @param shortWait If this parameter is ture the <CODE>mTimeOut</CODE> is set to 5000 ms, else it is set to * half of time out from parameter timeout. * @param param the TestParameters * @see lib.TestParameters * @see helper.OfficeWatcher */ - public ProcessHandler(String[] commands, PrintWriter log, File workDir, boolean shortWait, TestParameters param) { + public ProcessHandler(String[] commands, PrintWriter log, File workDir, int shortWait, TestParameters param) { this(null, log, workDir, null, 0); this.cmdLineArray = commands; this.param = param; - if (shortWait) { - this.mTimeOut = 5000; + if (shortWait != 0) { + this.mTimeOut = shortWait; } else { this.mTimeOut = (long) (param.getInt(PropertyName.TIME_OUT) / 1.3); } |