diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 15:49:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 15:49:48 +0300 |
| commit | b21cac7d4f40c33ba1d17c52bc209a92724692eb (patch) | |
| tree | bb753822586af5564f5d9ebe342c53e862597011 /automation/source | |
| parent | c9dd83a38f6027b9d9e7725644a682846a997edd (diff) | |
Drop OS2
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/testtool/makefile.mk | 2 | ||||
| -rw-r--r-- | automation/source/testtool/objtest.cxx | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index ee885e142..d23069e78 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -93,7 +93,7 @@ $(MISC)$/xfilter.pl : filter.pl .IF "$(GUI)"=="UNX" INIFILESUFFIX=rc BRANDPATH=none -.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ELIF "$(GUI)"=="WNT" INIFILESUFFIX=.ini BRANDPATH=.. .END diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 44a860497..5f7d3de9d 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -29,11 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_automation.hxx" -#ifdef OS2 -#define INCL_DOS -#include <svpm.h> -#endif - #include "sysdir_win.hxx" #include "registry_win.hxx" #include "sttresid.hxx" @@ -445,8 +440,6 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den abGP.Append( "15" ); // Linux x86-64 #elif defined LINUX && defined SPARC abGP.Append( "16" ); // Linux SPARC -#elif defined OS2 - abGP.Append( "17" ); #elif defined LINUX && defined MIPS abGP.Append( "18" ); // Linux MIPS #elif defined LINUX && defined ARM @@ -1142,9 +1135,6 @@ void TestToolObj::WaitForAnswer () while ( !bReturnOK && aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning() && aRun.IsValid() && aRun.IsRun() ) { - #ifdef OS2 - DosSleep(100); - #endif GetpApp()->Yield(); if ( BasicRuntimeAccess::HasRuntime() ) aRun = BasicRuntimeAccess::GetRuntime(); @@ -1296,9 +1286,6 @@ void TestToolObj::EndBlock() aTimer.Start(); while ( aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning() ) { - #ifdef OS2 - DosSleep(100); - #endif GetpApp()->Yield(); } } @@ -2306,14 +2293,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, osl::FileBase::getSystemPathFromFileURL( aUrl, aPath ); pVar->PutString( String( aPath ) ); } -#elif defined OS2 - { - char* etc = getenv("ETC"); - if (etc) - pVar->PutString( CUniString( etc ) ); - else - pVar->PutString( CUniString( "/etc" ) ); - } #else #if UNX pVar->PutString( CUniString( "/etc" ) ); |