CWS-TOOLING: integrate CWS unoapi04

2009-06-26 14:00:27 +0200 lla  r273410 : #i102248# cleanups
2009-06-26 13:36:44 +0200 lla  r273407 : #i102248# fix problem with too long sleeps and waits
2009-06-26 08:34:17 +0200 lla  r273393 : #i102248# cleanups
2009-06-26 08:28:43 +0200 lla  r273392 : #i102248# cleanups
2009-06-25 13:17:19 +0200 lla  r273379 : #i102248# add prototypes
2009-06-25 11:31:02 +0200 lla  r273371 : #i102248# cleanups
2009-06-25 11:15:18 +0200 lla  r273370 : #i102248# add a selftest for demonstration.
2009-06-25 10:53:35 +0200 lla  r273369 : #i102248# add a selftest for demonstration.
2009-06-25 10:38:10 +0200 lla  r273368 : #i102248# add a selftest for demonstration.
2009-06-23 11:09:35 +0200 lla  r273266 : #i102248# cleanup
2009-06-23 11:00:15 +0200 lla  r273265 : #i10i108248# add cwstestresult to cwscheckapi
2009-06-23 10:59:50 +0200 lla  r273264 : #i10i108248# add cwstestresult to cwscheckapi
2009-06-23 10:58:47 +0200 lla  r273263 : #i102248# add selftest

7 files changed, 288 insertions, 115 deletions

diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 6ddabfe9a46d..2a47bb8cf83e 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 PS=":"
 # cygwin:
 if [ "$GUI" = "WNT" ]; then
@@ -15,8 +16,15 @@ else
     myCLASSPATH=$JARFOLDER/OOoRunner.jar
 fi
 
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
 
 if [ -n "$JAVAI" ]; then
 	JAVABIN=$JAVAI
@@ -51,12 +59,13 @@ if [ -n "$RUNNERPROPS" ]; then
     PARAM="$PARAM -runnerini $RUNNERPROPS"
 fi
 
-MYXDEBUG=""
-if [ -n "$XDEBUG" ]; then
-    # export XDEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001" 
-    MYXDEBUG=$XDEBUG
+DEBUG_THE_API=""
+if [ -n "$DEBUGAPI" ]; then
+    export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y" 
+    DEBUG_THE_API=$DEBUGAPI
 fi
 
-COMMAND="$JAVABIN -Xmx120m $MYXDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
+COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
 echo $COMMAND
 $COMMAND
+# if COMMAND fails, it returns also the exitcode
diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
index fde6802f50dd..7af444eb601f 100644
--- a/solenv/bin/checkapi.btm
+++ b/solenv/bin/checkapi.btm
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 
 setlocal
 
@@ -27,13 +27,13 @@ IFF "%RUNNERPROPS%" != "" THEN
     SET PARAM=%PARAM% -runnerini %RUNNERPROPS%
 ENDIFF
 
-SET MYXDEBUG
+rem SET MYXDEBUG=""
 IFF "%XDEBUG%" != "" THEN
     REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 
-    SET MYXDEBUG=%XDEBUG
+    SET MYXDEBUG=%XDEBUG%
 ENDIFF
 
-set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
+set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
 
 
 echo %COMMAND
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index 357a40a20ee5..ddb56fd1d7c1 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -34,80 +34,136 @@ EXIT_FAILURE=1
 EXIT_ERROR=2
 EXIT_BUG=10
 
+# report the given error parameter to cwstestresult if the is one.
+# 0: no error send ok or parameter $2
+# 1: failure
+# 2...: incomplete
+function reportError()
+{
+    ERRORCODE=$1
+    if [ -e $SOLARENV/bin/cwstestresult.pl ]; then
+        if [ $ERRORCODE -eq 0 ]; then
+            PT_STATUS=${2:-ok} # use default 'ok' or $2
+        elif [ $ERRORCODE -eq 1 ]; then
+            PT_STATUS=failed
+        else
+            PT_STATUS=incomplete
+        fi
+
+        if [ "$OSTYPE" == "cygwin" ]; then
+            CWSENV=Windows
+        elif [ "$OSTYPE" == "linux" ]; then
+            CWSENV=Linux
+        elif [ "$OSTYPE" == "solaris" ]; then
+            CWSENV=SolarisX86
+        else
+            CWSENV=Unknown
+        fi
+        perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
+    else
+        echo "No cwstestresult.pl found."
+    fi
+}
+
 usage() {
-        echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-i] [-t] [-s] [-a]" >&2
-        echo "" >&2
-        echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
-        echo "" >&2
-        echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
-        echo "" >&2
-        echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-        echo "" >&2
-        echo "[-d] debug installation and UnoAPI-Tests" >&2
-        echo "" >&2
-        echo "[-i] debug installation" >&2
-        echo "" >&2
-        echo "[-t] debug UnoAPI-Tests" >&2
-        echo "" >&2
-        echo "[-s] skip installation of Office" >&2
-        echo "" >&2
-        echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
-        echo "" >&2
-        echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
-        echo "" >&2
-        exit $EXIT_FAILURE
+    echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2
+    echo "" >&2
+    echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
+    echo "" >&2
+    echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
+    echo "" >&2
+    echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
+    echo "" >&2
+    echo "[-d] debug installation and UnoAPI-Tests" >&2
+    # echo "" >&2
+    # echo "[-i] debug installation" >&2
+    echo "" >&2
+    echo "[-t] debug UnoAPI-Tests" >&2
+    echo "" >&2
+    echo "[-s] skip installation of Office" >&2
+    echo "" >&2
+    echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
+    echo "" >&2
+    echo "[-u] UseInstalledOffice: do not install an office" >&2
+    echo "" >&2
+    echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
+    echo "" >&2
+    exit $EXIT_FAILURE
 }
 
+# we start cwscheckapi
+reportError 0 running
+
 if [ "$PROEXT" != ".pro" ]; then
     echo "ERROR: cwscheckapi works only on pro-versions" >&2
+    reportError 2
     exit $EXIT_FAILURE
 fi
 
 if [ x${USER}x = xx ]; then
     if [ x${LOGNAME}x = xx ]; then
         echo "ERROR: could not determine username. Please export variable USER" >&2
+        reportError 2
         exit $EXIT_FAILURE
     else 
         USER=$LOGNAME
         export USER
     fi
 fi
-     
 
 
-DEBUG_I=false
+
+#DEBUG_I=false
 DEBUG_T=false
 INSTALL=true
-ATTACH=ture
+ATTACH=true
 MODULES="auto"
 OOO=false
 KEEPOFFICE=false
+USE_INSTALLED_OFFICE=false
 
-while getopts ':m:dkitsaho' OPTION ; do
+while getopts ':m:dkutsaho' OPTION ; do
         case $OPTION in
-        d)        DEBUG_I=true
-                  DEBUG_T=true
+            d)
+#                DEBUG_I=true
+                DEBUG_T=true
                 ;;
-        m)        MODULES="$OPTARG"
+            m) 
+                MODULES="$OPTARG"
                 ;;
-        k)        KEEPOFFICE=true
+            k)
+                KEEPOFFICE=true
                 ;;
-        o)        OOO=true
+            o)
+                OOO=true
                 ;;
-        i)        DEBUG_I=true
+#            i)
+#                DEBUG_I=true
+#                ;;
+            t)
+                DEBUG_T=true
                 ;;
-        t)        DEBUG_T=true
+            s)
+                INSTALL=false
                 ;;
-        s)        INSTALL=false
+            a)
+                ATTACH=false
                 ;;
-        a)        ATTACH=false
+            u)
+                USE_INSTALLED_OFFICE=true
+                INSTALL=false
+                KEEPOFFICE=true
+                echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;"
                 ;;
-        h)        usage $EXIT_SUCCESS
+            h)
+                usage $EXIT_SUCCESS
                 ;;
-        \?)        echo "unkown option \"-$OPTARG\"." >&2
-                usage $EXIT_ERROR
-                ;;
-        *)        echo "this is not possible...">&2
+            \?)
+            echo "unkown option \"-$OPTARG\"." >&2
+            usage $EXIT_ERROR
+            ;;
+            *)
+                echo "this is not possible...">&2
                 usage $EXIT_BUG
                 ;;
         esac
@@ -140,24 +196,24 @@ export LOCALUNPACKDIR
 
 unset FORCE2ARCHIVE
 
-date 2>&1
-
 if [ $INSTALL = true ]; then
-	
     
-	if [ $DEBUG_I = true ]; then
-        echo "start installation: `date`"
-		echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
-    fi
+    date 2>&1
+    
+#    if [ $DEBUG_I = true ]; then
+#        echo "start installation: `date`"
+#        echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
+#    fi
     perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I
-
+    
     EXITVAL=$?
     
     if [ $EXITVAL -ne 0 ]; then
         echo "ERROR: could not install office"
+        reportError 2
         exit $EXITVAL
     fi
-	echo "`date` installation successfull, start testing...." 
+    echo "`date` installation successfull, start testing...." 
 fi
 
 SOFFICE="soffice"
@@ -170,38 +226,57 @@ if [ "$GUI" = "WNT" ]; then
     SOFFICE="soffice.exe"
     PS=";"
     CYGWIN="-Cygwin true"
-    SHELL=`which bash`
-    SHELL=`cygpath -w $SHELL`
+    SHELL=$(which bash)
+    SHELL=$(cygpath -w $SHELL)
     if [ ! -f $SHELL ]; then
         echo "could not determine bash shell" 
+        reportError 2
         exit 1
     fi
 fi
 
-if [ $DEBUG_T = true ]; then
-    echo find $LOCALINSTALLDIR -name $SOFFICE
-fi
+# if [ $DEBUG_T = true ]; then
+#     echo find $LOCALINSTALLDIR -name $SOFFICE
+# fi
 
-OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
+if [ $USE_INSTALLED_OFFICE = false ]; then
 
-if [ ! -f "$OFFICEBIN" ]; then
-    echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
-    exit 1
-fi
+    OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
 
-if [ "$GUI" = "WNT" ]; then
+    if [ ! -f "$OFFICEBIN" ]; then
+        echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
+        reportError 2
+        exit 1
+    fi
+
+    if [ "$GUI" = "WNT" ]; then
     # transform /tmp/... -> c:\tmp\...
-    OFFICEBIN=`cygpath -w $OFFICEBIN`
+        OFFICEBIN=`cygpath -w $OFFICEBIN`
+    fi
+else
+    OFFICEBIN=$SOFFICE
+    echo "Use already installed and running office."
 fi
 
 JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
 SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/OOoRunner.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+
+myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+${JARFOLDER}/OOoRunner.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
+
 PARAM=""
 if [ -n "$JAVAI" ]; then
-        JAVABIN=$JAVAI
+    JAVABIN=$JAVAI
 elif [ -n "$JAVA_HOME" ]; then
     if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
         JAVABIN=$JAVA_HOME/bin/sparcv9/java
@@ -209,19 +284,20 @@ elif [ -n "$JAVA_HOME" ]; then
         JAVABIN=$JAVA_HOME/bin/java
     fi
 else
-        echo "please set environment variable JAVA_HOME"
-        exit 1
+    echo "please set environment variable JAVA_HOME"
+    reportError 2
+    exit 1
 fi
 
 if [ -n "$WORK_STAMP" ]; then
-	if [ -n "$CWS_WORK_STAMP" ]; then
+    if [ -n "$CWS_WORK_STAMP" ]; then
         PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}"
-	else
-	    echo "######"
-	    echo CAUTION! You are working on the MWS
-	    echo "######"
+    else
+        echo "######"
+        echo CAUTION! You are working on the MWS
+        echo "######"
         PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}"
-	fi
+    fi
 fi
 
 PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
@@ -241,12 +317,33 @@ if [ $DEBUG_T = true ]; then
     PARAM="$PARAM -debug true -log true"
 fi
 
-#XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 " 
+# Sample command
+# /so/env/Linux_JDK_1.5.0_06/bin/java
+# -Xmx120m $XDEBUG
+# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50
+# org.openoffice.Runner
+# -Version cws_unoapi04
+# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation'
+# -cs pipe,name=ll93751
+# -NoOffice true
+# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50
+# -COMP_ENV unxlngi6
+# -Shell /bin/bash 
+# -tb java_complex
+# -TimeOut 90000 
+# -o 'complex.unoapi.CheckModuleAPI::module(auto)'
+
+# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y "
+
+# set DEBUGAPI if you want to debug the checkapi
+# DEBUGAPI=t
+
 COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
 echo "$COMMAND"
 
 LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
 $COMMAND | tee $LOGFILE
+EXITVAL=$?
 
 if [ $KEEPOFFICE = false ]; then
     echo "remove office instrallation in $LOCALINSTALLDIR..."
@@ -256,4 +353,11 @@ fi
 echo
 echo A logfile could be found here: $LOGFILE
 
-date 2>&1
\ No newline at end of file
+date 2>&1
+
+# send the results via cwstestresult.pl to EIS
+if [ $EXITVAL -eq 0 ]; then
+    reportError 0 ok
+else
+    reportError 1
+fi
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
index 96e2dd7c2afc..64c624dd4bba 100755
--- a/solenv/bin/cwscheckapi.btm
+++ b/solenv/bin/cwscheckapi.btm
@@ -28,10 +28,13 @@ REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
 REM ************************************************************************/
 
-echo off
+rem echo on
+
+call reportErrorCheckAPI.btm 0 running
 
 iff "%PROEXT" != ".pro" THEN
     echo ERROR: cwscheckapi works only on pro-versions >&2
+    call reportErrorCheckAPI.btm 2
     quit 1
 endiff
 
@@ -42,6 +45,7 @@ SET ATTACH=true
 SET MODULES=auto
 SET OOO=false
 SET KEEPOFFICE=false
+SET USE_INSTALLED_OFFICE=false
 
 for %opt in (%&%) DO (
     if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift)
@@ -51,6 +55,7 @@ for %opt in (%&%) DO (
     if "%opt%" == "-m" (SET MODULES=%2  ^ shift ^ shift)
     if "%opt%" == "-t" (SET DEBUG_T=true ^ shift)
     if "%opt%" == "-s" (SET INSTALL=false ^ shift)
+    if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift)
     if "%opt%" == "-a" (SET attach=false ^ shift)
     if "%opt%" == "-h" goto usage
     if "%opt%" == "/h" goto usage
@@ -81,25 +86,33 @@ iff "%INSTALL%" == "true" THEN
     
     IFF %? NE 0 THEN
         echo ERROR: coud not install office  >&2
+        call reportErrorCheckAPI.btm 2
         quit %?
     ENDIFF
 ENDIFF
 
 setlocal
 
-SET CWD=%_CWD%
-cdd %LOCALINSTALLDIR%
-SET ffindtxt="ffind.txt"
-ffind /s /f /m soffice.exe > %ffindtxt
-SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
-SET OfficeBin=%@FILEREAD[%FindFile]
-set dummy=%@FILECLOSE[%FindFile]
-DEL /q %ffindtxt
-cdd %CWD
-
-IFF NOT EXIST %OFFICEBIN% THEN
-    echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
-    quit 1
+IFF %USE_INSTALLED_OFFICE% == "false" then
+
+    SET CWD=%_CWD%
+    cdd %LOCALINSTALLDIR%
+    SET ffindtxt="ffind.txt"
+    ffind /s /f /m soffice.exe > %ffindtxt
+    SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
+    SET OfficeBin=%@FILEREAD[%FindFile]
+    set dummy=%@FILECLOSE[%FindFile]
+    DEL /q %ffindtxt
+    cdd %CWD
+
+    IFF NOT EXIST %OFFICEBIN% THEN
+        echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
+        call reportErrorCheckAPI.btm 2
+        quit 1
+    ENDIFF
+ELSE
+    SET OFFICEBIN=soffice.exe
+    echo "Use already installed office."
 ENDIFF
 
 SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
@@ -111,6 +124,7 @@ ELSEIFF "%JAVA_HOME%" != "" THEN
     SET JAVABIN=%JAVA_HOME%\bin\java
 ELSE
    echo please set environment variable JAVA_HOME  >&2
+   call reportErrorCheckAPI.btm 2
    quit 1
 ENDIFF
 
@@ -125,6 +139,7 @@ ELSE
     echo ######  >&2
     echo ERROR: could not determine your CWS or MWS version  >&2
     echo ######  >&2
+    call reportErrorCheckAPI.btm 2
     quit 1
 ENDIFF
 
@@ -148,6 +163,7 @@ set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM%
 echo %COMMANDO
 SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log
 %COMMANDO |& tee %LOGFILE%
+set EXITVAL=%?
 
 IFF %KEEPOFFICE% == "false" THEN
     echo remove office instrallation in %LOCALINSTALLDIR%...
@@ -157,6 +173,12 @@ fi
 echo .
 echo A logfile could be found here: %LOGFILE%
 
+IFF %EXITVAL% NE 0 THEN
+    call reportErrorCheckAPI.btm 1
+ELSE
+    call reportErrorCheckAPI.btm 0 ok
+ENDIFF
+
 endlocal
 
 quit 0
diff --git a/solenv/bin/cwstouched b/solenv/bin/cwstouched
index 1847ce388d76..dac08c07f9a7 100755
--- a/solenv/bin/cwstouched
+++ b/solenv/bin/cwstouched
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec perl -w $SOLARENV/bin/cwstouched.pl
\ No newline at end of file
+exec perl -w $SOLARENV/bin/cwstouched.pl
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 0171e39d9fd4..03e5095e78b4 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -42,6 +42,10 @@ use lib (@lib_dirs);
 
 use Cws;
 
+# Prototypes
+sub getMinor($);
+sub getCwsWorkStamp();
+
 my $workstamp = $ENV{'WORK_STAMP'};
 my $solenv= $ENV{'SOLARENV'};
 my $cwsWorkStamp = getCwsWorkStamp();
@@ -53,12 +57,16 @@ my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/ta
 my @diff = `$svndiff`;
 
 my @modules;
-foreach(@diff){
-    if (/.*svn:\/\/svn.services.openoffice.org.*/){
+foreach(@diff)
+{
+    if (/.*svn:\/\/svn.services.openoffice.org.*/)
+    {
         $_ =~ /.*$oldWorkStamp\/(\w*)/;
         my $newModule=$1;
-        if (defined($newModule)){
-            if ( ! grep(/$newModule/,@modules)){
+        if (defined($newModule))
+        {
+            if ( ! grep(/$newModule/,@modules))
+            {
                 push(@modules, $newModule);
             }
 
@@ -66,17 +74,20 @@ foreach(@diff){
     }
 }
 
-foreach(@modules){
+foreach(@modules)
+{
     print "$_\n";
 }
 
 exit(0);
 
-sub getMinor{
+sub getMinor($)
+{
     my $workst = shift;
     my $min="";
 
-    if ( ! defined($ENV{'UPDMINOR'})){
+    if ( ! defined($ENV{'UPDMINOR'}))
+    {
         my $cws = Cws->new();
         $cws->child($workst);
         $cws->master($ENV{'WORK_STAMP'});
@@ -85,18 +96,22 @@ sub getMinor{
 
         # check if we got a valid child workspace
         my $id = $cws->eis_id();
-        if ( !$id ) {
+        if ( !$id )
+        {
             print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n");
             exit(1);
         }
 
         my @milestones = $cws->milestone();
         foreach (@milestones) {
-            if ( defined($_) ) {
+            if ( defined($_) )
+            {
                 $min=$_;
             }
         }
-    } else {
+    }
+    else
+    {
         $min = $ENV{'UPDMINOR'};
     }
 
@@ -104,25 +119,31 @@ sub getMinor{
     return $min;
 }
 
-sub getCwsWorkStamp {
+sub getCwsWorkStamp()
+{
     my $cwsWorkSt="";
 
-    if ( ! defined($ENV{'CWS_WORK_STAMP'})){
+    if ( ! defined($ENV{'CWS_WORK_STAMP'}))
+    {
         my $currPath= cwd;
 
         chdir($ENV{'SOLARENV'});
 
         my @info = `svn info`;
 
-        foreach(@info) {
-            if ( /URL:.*/ ){
+        foreach(@info)
+        {
+            if ( /URL:.*/ )
+            {
                 # URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv
                 $_ =
~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/;
                 $cwsWorkSt=$2; #qadev37
             }
         }
 
-    } else {
+    }
+    else
+    {
         $cwsWorkSt = $ENV{'CWS_WORK_STAMP'};
     }
     return $cwsWorkSt
diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm
new file mode 100755
index 000000000000..4340ad347259
--- /dev/null
+++ b/solenv/bin/reportErrorCheckAPI.btm
@@ -0,0 +1,17 @@
+set ERRORCODE=%1%
+iff exist %SOLARENV%/bin/cwstestresult.pl then
+    iff %ERRORCODE% EQ 0 then
+        set PT_STATUS=%2%
+    else
+        iff %ERRORCODE% EQ 1 then
+            set PT_STATUS=failed
+        else       
+            set PT_STATUS=incomplete
+        endiff
+    endiff
+
+    set CWSENV=Windows
+    call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS%
+else
+    echo "No cwstestresult.pl found."
+endiff