diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-15 18:14:02 +0100 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-15 18:14:02 +0100 |
commit | b457ecb4f5caf814e47d8ed3009e7d792a3a31a0 (patch) | |
tree | 82bbd4ac219c54e4f59cd5e539ef7eae0816e7ee /testautomation | |
parent | 8791e395bbfc3ab9e0d9ebc8a57b71974e86f98f (diff) | |
parent | 1339ae3d816305b53eedab1036cf8619ad6ea092 (diff) |
CWS-TOOLING: integrate CWS spc01_DEV300
Diffstat (limited to 'testautomation')
-rw-r--r--[-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..100644 --- 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 = "" |