diff options
author | Marc Neumann [msc] <Marc.Neumann@oracle.com> | 2010-11-25 09:17:59 +0100 |
---|---|---|
committer | Marc Neumann [msc] <Marc.Neumann@oracle.com> | 2010-11-25 09:17:59 +0100 |
commit | 1339ae3d816305b53eedab1036cf8619ad6ea092 (patch) | |
tree | 87a62c01b8597ef2c406f90625d78c352cda7c00 /testautomation | |
parent | CWS-TOOLING: integrate CWS automationooo330m9 (diff) | |
download | core-1339ae3d816305b53eedab1036cf8619ad6ea092.tar.gz core-1339ae3d816305b53eedab1036cf8619ad6ea092.zip |
cws spc01: #163967#
Diffstat (limited to 'testautomation')
-rwxr-xr-x | testautomation/global/system/includes/iniinfo.inc | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index 0b83af421eeb..3423584253fd 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -115,17 +115,33 @@ sub GetIniInformation end if '-------- - call GetTheInstallationType ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation - gOfficeBasisPath = getOfficeBasisPath() - gOOoStartupTimeOut = fgetOOoStartupTimeOut() - gOOoShutdownTimeOut = fgetOOoShutdownTimeOut() - call sCheckValgrindStatus() - ' set a global path for custom scripts, like basepath, but outside of current environment - gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current") + call GetTheInstallationType ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation + gOfficeBasisPath = getOfficeBasisPath() + gOOoStartupTimeOut = fgetOOoStartupTimeOut() + gOOoShutdownTimeOut = fgetOOoShutdownTimeOut() + call sCheckValgrindStatus() + ' set a global path for custom scripts outside of current environment + gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current") if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then - if NOT fileExists(gPrivateEnvironmentLocation) then - qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!" - gPrivateEnvironmentLocation = "" + ' check if the gPrivateEnvironmentLocation path exists + if fileExists(gPrivateEnvironmentLocation) then + ' check if the path ends with a path sign and add the path sign if not + if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then + gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne + endif + else + ' check if the gTesttoolPath plus the gPrivateEnvironmentLocation path exists + ' f.e. this is for a relative path + if fileExists(gTesttoolPath & gPrivateEnvironmentLocation) then + gPrivateEnvironmentLocation = gTesttoolPath & gPrivateEnvironmentLocation + ' check if the path ends with a path sign and add the path sign if not + if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then + gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne + endif + else + qaErrorLog "[PrivateEnvironment] defined in: '" & gTesttoolIni & "', but the path '" & gPrivateEnvironmentLocation & "'does not exist!" + gPrivateEnvironmentLocation = "" + endif end if else gPrivateEnvironmentLocation = "" |