CHG: preparation for CWS handling

testautomation/global/system/includes/iniinfo.inc

@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: iniinfo.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:05 $
+'* last change: $Author: tbo $ $Date: 2008-06-18 10:02:29 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -75,6 +75,7 @@ sub GetIniInformation
     dim sSoffice(3) as string ' array, because they might all get evaluated sometime
     dim bOOo(3) as string
     dim iSoffice(3) as integer
+    dim sTemp as string
     
     gPathSigne = hGetPathSigne(gPLatform)
 
@@ -148,6 +149,14 @@ sub GetIniInformation
    gOOoStartupTimeOut = fgetOOoStartupTimeOut()
    gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
    call sCheckValgrindStatus()
+   gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
+   sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc")
+   if fileExists(sTemp) then
+       use sTemp
+       call getUseFilesPrivateEnvironment
+   else
+       gPrivateEnvironmentLocation = ""
+   end if
 end sub
 
 '-------------------------------------------------------------------------

testautomation/global/system/includes/master.inc

@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: master.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:05 $
+'* last change: $Author: tbo $ $Date: 2008-06-18 10:02:29 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -117,6 +117,7 @@ sub GetUseFiles
 '/// At the resulting path of BaseDirectory + gPrivateEnvironmentLocation + 'inc/' there has to exist the file: privateenvironment.inc
 '/// with at least the sub: getUseFilesPrivateEnvironment which will get executed
 
+    if (gPrivateEnvironmentLocation = "") then
     sPrivateEnvironmentLocation = ConvertPath (gTestToolPath + "errorlog\privateenvironment.txt")
     if fileExists(sPrivateEnvironmentLocation) then
         gPrivateEnvironmentLocation = getIniValue(sPrivateEnvironmentLocation, "PrivateEnvironment", "Current")
@@ -131,6 +132,7 @@ sub GetUseFiles
     else
         qaErrorLog "Private Environment Control File Location specified in '" + sPrivateEnvironmentLocation + "', but the file doesn't exist: '" +sTemp+ "'"
     end if
+    end if
     
     ' Check if environment works with this OOo version
 '/// Control the behaviour of the environment via the file qa/qatesttool/global/version.txt:
@@ -905,6 +907,8 @@ sub hDetectStatusDatabase as Boolean
     dim sOOoLocalStatusDatabase as string
     dim sPrivateEnvironmentLocation as string
   
+    gStatusFeatureLevel = GetIniValue ( gTesttoolIni, "StatusFeatureLevel" , "Current" )
+    if gStatusFeatureLevel = "" then
     sPrivateEnvironmentLocation = ConvertPath (gTestToolPath + "errorlog\privateenvironment.txt")
     if fileExists(sPrivateEnvironmentLocation) then
         gStatusFeatureLevel = getIniValue(sPrivateEnvironmentLocation, "StatusFeatureLevel", "Current")
@@ -912,6 +916,7 @@ sub hDetectStatusDatabase as Boolean
 	' manual submitting status from errorlog directory
         gStatusFeatureLevel = 2
     end if
+    end if
     if gStatusFeatureLevel = 0 then
 	' automatical submitting status; filespace location defined in privateenvironment.inc
         hDetectStatusDatabase = TRUE