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

1 files changed, 7 insertions, 3 deletions

diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 80648ae34e06..4ca0728de864 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -130,7 +130,7 @@ public class CheckModuleAPI extends ComplexTestCase {
 
         final String[] commands = getCommands(sUnoapi);
 
-        final ProcessHandler procHdl = bet.runCommandsInEnvironmentShell(commands, fUnoapi, false);
+        final ProcessHandler procHdl = bet.runCommandsInEnvironmentShell(commands, fUnoapi, 0);
         log.println("exit code of dmake: " + procHdl.getExitCode());
         String test = procHdl.getOutputText();
         test = procHdl.getErrorText();
@@ -204,9 +204,13 @@ public class CheckModuleAPI extends ComplexTestCase {
         String[] cmdLines = null;
         final String platform = (String) param.get(PropertyName.OPERATING_SYSTEM);
         log.println("prepare command for platform " + platform);
-        if (platform.equals(PropertyName.WNTMSCI)) {
+
+        if (platform.equals(PropertyName.WNTMSCI)){
+            if (param.getBool(PropertyName.CYGWIN)){
+                cmdLines = new String[]{"cd `cygpath '" + sUnoapi.replaceAll("\\\\", "\\\\\\\\")+ "'`", "dmake"};
+            } else{
             cmdLines = new String[]{"cdd " + sUnoapi, "dmake"};
-//            cmdLines = new String[]{shell, "/C ", "\"echo Test ^ " + envcmd + " ^ cdd " + sUnoapi + "^ pwd ^ dmake\""};
+            }
         } else {
                 cmdLines = new String[]{"cd " + sUnoapi, "dmake"};
             }