From b786a33cfdca2e8a4114ddef0340e0e0628dd09c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 21 Oct 2011 17:18:13 +0200
Subject: Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR
 and BaseInstallation.

---
 testautomation/global/system/includes/iniinfo.inc | 42 ++---------------------
 testautomation/tools/run_tests/run_tests.sh       |  2 +-
 2 files changed, 3 insertions(+), 41 deletions(-)

(limited to 'testautomation')

diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 93b4a22841f5..727763968076 100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -1130,44 +1130,6 @@ end function
 function getOfficeBasisPath as string
 
     const CFN = "global::system::iniinfo.inc:getOfficeBasisPath: "
-    'get the basis directory from the information of basis-link
-    dim ltemp(5) as string
-    dim sFile as string
-    dim sTemp as string
-    dim sPath as string
-
-    sTemp = gNetzOfficePath
-    sFile = gNetzOfficePath & "basis-link"
-
-    if FileExists( sFile ) then
-        if ( lcase( gPlatform ) = "osx" ) then
-            'MacOS X
-            sTemp = sFile
-        else
-            if ( gPlatGroup = "unx" ) then
-                'Unixes
-                sPath = getLinkDestination( sFile )
-                sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sPath )
-                if ( NOT FileExists( sTemp ) ) then
-                    sTemp = fRelativeToAbsolutePath( sPath )
-                endif
-
-            else
-                'all other platforms are Windows/DOS style
-                ListRead( lTemp, sFile )
-                if lTemp(1) <> "" then
-                    stemp = lTemp(1)
-                    sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sTemp )
-                endif
-            endif
-        endif
-    else
-        warnlog( CFN & "Basis-link could not be found" )
-    endif
-
-    if ( NOT FileExists( sTemp ) ) then
-        warnlog( CFN & "Retrieved invalid path" )
-    endif
-
-    getOfficeBasisPath = sTemp & gPathSigne
+    'get the basis directory
+    getOfficeBasisPath = gNetzOfficePath & gPathSigne
 end function
diff --git a/testautomation/tools/run_tests/run_tests.sh b/testautomation/tools/run_tests/run_tests.sh
index 0c4dc85bcc1f..a6cc294647e4 100755
--- a/testautomation/tools/run_tests/run_tests.sh
+++ b/testautomation/tools/run_tests/run_tests.sh
@@ -107,7 +107,7 @@ sResetOfficeBas="${sLocation}global/tools/resetoffice.bas"
 if [ -z "$sTestTool" ]
 then
    sTestTool=`GetValueFromSection Current OOoProgramDir "$testtoolrc"`
-   sTestTool="$sTestTool/basis-link/program/testtool.bin"
+   sTestTool="$sTestTool/program/testtool.bin"
 fi
 
 
-- 
cgit v1.2.3