diff options
Diffstat (limited to 'sal/qa')
24 files changed, 50 insertions, 89 deletions
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl index 86101fd365a7..02fc352bba89 100644 --- a/sal/qa/buildall.pl +++ b/sal/qa/buildall.pl @@ -150,11 +150,6 @@ sub initEnvironment() $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}"; last SWITCH; } - if ( $gui eq "OS2" ) { - $FS = "\\"; - $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}"; - last SWITCH; - } if ( $gui eq "UNX" ) { $FS = "/"; $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}"; @@ -181,7 +176,7 @@ sub getLibName($) { return "lib" . $sFile . ".so"; } - if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2") + if ($OSNAME eq "MSWin32") { return $sFile . ".dll"; } @@ -320,7 +315,7 @@ sub runASingleTest($$) # } # else # { -# if ($OSNAME eq "MSWin32" || $OSNAME eq "OS2") +# if ($OSNAME eq "MSWin32") # { # # test # $redirect = ">>$sLogFile 2>>$sLogFile"; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b16b543fa887..a9349b969bbd 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -238,8 +238,9 @@ inline void printTime( TimeValue *tv ) /** compare two TimeValue, unit is "ms", since Windows time precision is better than UNX. */ +/* FIXME: the above assertion is bogus */ -#if ( defined UNX ) || ( defined OS2 ) //precision of time in Windows is better than UNX +#if ( defined UNX ) //precision of time in Windows is better than UNX # define delta 2000 //time precision, 2000ms #else # define delta 1800 //time precision, 1.8s @@ -643,7 +644,7 @@ inline ::rtl::OString outputError( const ::rtl::OString & returnVal, const ::rtl /** Change file mode, two version in UNIX and Windows;. */ -#if ( defined UNX ) || ( defined OS2 ) //chmod() method is differ in Windows +#if ( defined UNX ) //chmod() method is differ in Windows inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode ) { rtl::OString aString; @@ -784,7 +785,7 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_001_8() { rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp/ok")) ); -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume ); #else check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_INVAL, suAssume ); @@ -792,7 +793,7 @@ namespace osl_FileBase } void getAbsoluteFileURL::getAbsoluteFileURL_002() { -#if ( defined UNX ) || ( defined OS2 ) //Link is not defined in Windows +#if ( defined UNX ) //Link is not defined in Windows ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file")); ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name")); @@ -1520,7 +1521,7 @@ namespace osl_VolumeInfo sal_True == compareFileName( aUStr, aNullURL ) ); } -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) void ctors_002( ) { ::osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_TotalSpace | @@ -1612,7 +1613,7 @@ namespace osl_VolumeInfo sal_True == aVolumeInfo.isValid( mask ) ); } -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) void isValid_002( ) { sal_Int32 mask = osl_VolumeInfo_Mask_Attributes | osl_VolumeInfo_Mask_TotalSpace | osl_VolumeInfo_Mask_UsedSpace | @@ -1681,7 +1682,7 @@ namespace osl_VolumeInfo ( sal_False == bOk ) ); } - #if ( defined UNX ) || ( defined OS2 ) //remote Volume is different in Solaris and Windows + #if ( defined UNX ) //remote Volume is different in Solaris and Windows void getRemoteFlag_002( ) { sal_Int32 mask = osl_VolumeInfo_Mask_Attributes; @@ -2175,7 +2176,7 @@ namespace osl_VolumeInfo } -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) void getMaxNameLength_002( ) { struct statvfs aStatFS; @@ -2234,7 +2235,7 @@ namespace osl_VolumeInfo } -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) void getMaxPathLength_002( ) { sal_Int32 mask = osl_VolumeInfo_Mask_MaxPathLength; @@ -2865,7 +2866,7 @@ namespace osl_FileStatus } // test code. -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) //windows only 3 file attributes: normal, readonly, hidden void getAttributes_001( ) { @@ -2890,7 +2891,7 @@ namespace osl_FileStatus void getAttributes_002( ) { -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) changeFileMode( aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH ); ::osl::FileStatus rFileStatus( FileStatusMask_Attributes ); @@ -2904,7 +2905,7 @@ namespace osl_FileStatus } -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) void getAttributes_003( ) { changeFileMode( aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH ); @@ -2925,7 +2926,7 @@ namespace osl_FileStatus } #endif -#if ( defined UNX ) || ( defined OS2 ) //hidden file definition may different in Windows +#if ( defined UNX ) //hidden file definition may different in Windows void getAttributes_004( ) { sal_Int32 test_Attributes = Attribute_Hidden; @@ -3243,7 +3244,7 @@ namespace osl_FileStatus deleteTestFile( aTypeURL ); } -#if ( defined UNX ) || ( defined OS2 ) //Link file is not define in Windows +#if ( defined UNX ) //Link file is not define in Windows void getLinkTargetURL_001( ) { //create a link file; @@ -6293,7 +6294,7 @@ class GlobalObject try { //~ special clean up task in Windows and Unix seperately; -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) //~ some clean up task for UNIX OS ; #else diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index 2e423b1622d7..f49d63d76743 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -82,7 +82,7 @@ const sal_Char pBuffer_Blank[] = ""; //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> # include <math.h> @@ -187,7 +187,7 @@ OSLTEST_DECLARE( FifoSys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" // socket, link, etc. // Note that this may be changed in the different platform, so be careful to use. //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) // Unix +#if ( defined UNX ) // Unix OSLTEST_DECLARE( TypeURL1, FILE_PREFIX "dev/ccv"); //socket Solaris/Linux OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "devices/pseudo/tcp@0:tcp"); //special Solaris/Linux OSLTEST_DECLARE( TypeURL3, FILE_PREFIX "lib" ); //link Solaris @@ -201,7 +201,7 @@ OSLTEST_DECLARE( TypeURL3, FILE_PREFIX "" ); // Volume device URL, we pick some canonical volume device for test: // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk. //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) // Unix +#if ( defined UNX ) // Unix OSLTEST_DECLARE( VolURL1, FILE_PREFIX ""); //ufs Solaris/Linux #ifdef SOLARIS OSLTEST_DECLARE( VolURL2, FILE_PREFIX "dev/fd" ); //fd Solaris diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 629d201f908e..9074a281ff9a 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -39,7 +39,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> #endif #if ( defined WNT ) // Windows diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 80c2e69f2de7..b4b2ecc8f4bd 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -72,7 +72,7 @@ namespace ThreadHelper #ifdef WNT //Windows Sleep( _nSec * 1000 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix sleep( _nSec ); #endif // printf("# done\n" ); @@ -82,7 +82,7 @@ namespace ThreadHelper #ifdef WNT //Windows Sleep(_nTenthSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix TimeValue nTV; nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 ); nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 ); diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 73544ba1dfe0..ba5f8dadbc74 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -884,7 +884,7 @@ namespace osl_StreamPipe #ifdef WNT //Windows Sleep( _nSec * 1000 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix sleep( _nSec ); #endif // printf("done\n" ); diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index 8e050cfbb46e..cf78cd5f5f6c 100644 --- a/sal/qa/osl/process/makefile.mk +++ b/sal/qa/osl/process/makefile.mk @@ -75,16 +75,8 @@ SHL2DEPN=$(APP3TARGETN) \ #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies -.IF "$(GUI)" == "OS2" - -SLOFILES=$(SHL2OBJS) - -.ELSE - SLOFILES=$(SHL1OBJS) $(SHL2OBJS) -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 1604a762c76f..db22198ca4a1 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,7 @@ # endif #endif -#if defined(WNT) || defined(OS2) +#if defined(WNT) const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child.exe")); #else const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child")); @@ -672,7 +672,7 @@ public: void osl_execProc_test_batch() { oslProcess process; -#if defined(WNT) || defined(OS2) +#if defined(WNT) rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.bat")); #else rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.sh")); diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 0094ea388541..b454e004d032 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -379,7 +379,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, t_print("#if no text forwarded, this function will be skipped.\n" ); /// get system information -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) /// some initialization work for UNIX OS diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index e05018baa50d..74e068e2595d 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -41,7 +41,7 @@ #include <stdlib.h> #include <stdio.h> -#if ( defined UNX ) || ( defined OS2 ) +#if ( defined UNX ) #include <unistd.h> #include <pwd.h> #endif diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 47ae4d0cef32..f16dc16782ef 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -242,7 +242,7 @@ void thread_sleep( sal_Int32 _nSec ) #ifdef WNT //Windows Sleep( _nSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix usleep(_nSec * 100000); #endif t_print("# done\n" ); diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 0aff414a34a0..03fcf85c9cae 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -64,7 +64,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> # include <string.h> diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index 76fb491459ec..d40ad9174598 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -64,7 +64,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> # include <string.h> diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index c60ca0006fcc..1aaab989e4a8 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -203,7 +203,7 @@ void thread_sleep( sal_Int32 _nSec ) #ifdef WNT //Windows Sleep( _nSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix usleep(_nSec * 100000); #endif // t_print("# done\n" ); diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index c0f6e85ad3ec..fb01ed47cb50 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -52,7 +52,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix #include <unistd.h> #include <limits.h> diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index e10c75f1a020..e0499a4e7025 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -125,7 +125,7 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename) rtl::OUString aDirURL(getExecutableDirectory()); aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aDirURL += OUString::createFromAscii( _sFilename.getStr() ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini")); #else aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc")); @@ -138,7 +138,7 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) #ifdef WNT //Windows Sleep(_nTenthSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) TimeValue nTV; nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 ); nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 ); @@ -307,7 +307,7 @@ namespace rtl_Bootstrap oslProcess hProcess = NULL; rtl::OUString suFileURL = suCWD; suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString::createFromAscii(process_name) ; -#if defined(WNT) || defined(OS2) +#if defined(WNT) suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe")); #endif const int nParameterCount = 3; @@ -590,7 +590,7 @@ namespace rtl_Bootstrap rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN")); aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl")); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini")); #else aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc")); @@ -836,7 +836,7 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co static void create_rtlrc() { rtl::OUString aFileURL(getExecutableDirectory()); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini")); #else aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc")); @@ -859,7 +859,7 @@ static void create_rtlrc() static void create_testshl2rc() { rtl::OUString aFileURL(getExecutableDirectory()); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini")); #else aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc")); @@ -899,7 +899,7 @@ static void create_testshl2rc() static void create_pseudorc() { rtl::OUString aFileURL(getExecutableDirectory()); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini")); #else aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc")); @@ -916,7 +916,7 @@ static void create_pseudorc() void create_bootstrap_processrc() { rtl::OUString aDirURL(getModulePath()); -#if defined(WNT) || defined(OS2) +#if defined(WNT) aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini")); #else aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc")); diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index cdb0b965e357..71bd5023a6bd 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -79,7 +79,7 @@ namespace ThreadHelper #ifdef WNT //Windows Sleep(_nTenthSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) TimeValue nTV; nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 ); nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 ); diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 816e4da21e70..3360fc34d8cf 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -37,7 +37,7 @@ #include <stdlib.h> #include <string.h> -#if defined(UNX) || defined(OS2) +#if defined(UNX) # include <unistd.h> #endif diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index a8e95d199d1c..426bddfb14b3 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -94,7 +94,7 @@ public: void getAppCommandArg_001() { -#if defined(WNT) || defined(OS2) +#if defined(WNT) const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe")); #else const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process")); @@ -231,7 +231,7 @@ public: //different processes different pids void getGlobalProcessId_002() { -#if defined(WNT) || defined(OS2) +#if defined(WNT) const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe")); #else const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id")); diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 18d032dc1d20..a3efeda62ade 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -155,7 +155,7 @@ namespace ThreadHelper #ifdef WNT //Windows Sleep(_nSec * 10 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) sleep( _nSec ); #endif } diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h index 37128465acb6..2b14b46c9ab5 100644 --- a/sal/qa/rtl_strings/rtl_String_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Const.h @@ -394,7 +394,7 @@ static const sal_Int16 kSInt16Max = SHRT_MAX; static const sal_Int32 kUInt16Max = USHRT_MAX; static const sal_Int32 kSInt32Max = INT_MAX; static const sal_Int64 kUInt32Max = UINT_MAX; -#if (defined UNX) || (defined OS2) +#if (defined UNX) static const sal_Int64 kSInt64Max = 9223372036854775807LL; #else static const sal_Int64 kSInt64Max = 9223372036854775807; diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx index 6f7ce6fb0b58..214b228bfef5 100644 --- a/sal/qa/rtl_strings/rtl_old_testostring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx @@ -106,18 +106,13 @@ void oldtests::test_OString() s6 = s5.valueOf(n); TEST_ENSURE( s6.compareTo("123456789") == 0, "test_OString error 16"); -#ifndef SAL_OS2 #ifdef SAL_UNX sal_Int64 m = -3223372036854775807LL; -#elif defined(SAL_OS2) - sal_Int64 m; - sal_setInt64(&m, 3965190145L, -750499787L); #else sal_Int64 m = -3223372036854775807; #endif s6 = s5.valueOf(m); TEST_ENSURE( s6.compareTo("-3223372036854775807") == 0, "test_OString error 17"); -#endif OString s7("HaLLo"); s7 = s7.toAsciiLowerCase(); diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx index b16fcf254e08..082be3cde71c 100644 --- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx @@ -39,9 +39,6 @@ #ifdef UNX #include <wchar.h> #endif -#ifdef OS2__00 -#include <wcstr.h> -#endif #include <rtl/ustring.hxx> @@ -118,18 +115,13 @@ void oldtests::test_OUString() s6 = s5.valueOf(n); TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16"); -#ifndef SAL_OS2 #ifdef SAL_UNX sal_Int64 m = -3223372036854775807LL; -#elif defined(SAL_OS2) - sal_Int64 m; - sal_setInt64(&m, 3965190145L, -750499787L); #else sal_Int64 m = -3223372036854775807; #endif s6 = s5.valueOf(m); TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17"); -#endif // LLA: locale tests removed ::rtl::OLocale locale = ::rtl::OLocale::getDefault(); // LLA: locale tests removed @@ -326,7 +318,7 @@ void oldtests::test_OUString() // toInt64 OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) ); sal_Int64 ln1 = s9.toInt64(); -#if (defined UNX) || (defined OS2) +#if (defined UNX) TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" ); #else TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" ); @@ -336,7 +328,7 @@ void oldtests::test_OUString() TEST_ENSURE( ln2 == 13243, "test_OWString error 68" ); sal_Int64 ln3 = s10.toInt64( 16 ); -#if (defined UNX) || (defined OS2) +#if (defined UNX) TEST_ENSURE( ln3 == 0x13243A65F1LL, "test_OWString error 69" ); #else TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" ); diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx index 0ed2c39e70d1..f1bec70cb39e 100644 --- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx +++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx @@ -93,12 +93,8 @@ void oldtests::test_OStringBuffer() b2.append(n); TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 5"); -#ifndef SAL_OS2 #ifdef SAL_UNX sal_Int64 m = -3223372036854775807LL; -#elif defined(SAL_OS2) - sal_Int64 m; - sal_setInt64(&m, 3965190145L, -750499787L); #else sal_Int64 m = -3223372036854775807; #endif @@ -106,7 +102,6 @@ void oldtests::test_OStringBuffer() b2.append(" "); b2.append(m); TEST_ENSURE( s1 == b2.getStr(), "test_OStringBuffer error 6"); -#endif OString s2(b2.makeStringAndClear()); TEST_ENSURE( s1 == s2, "test_OStringBuffer error 7"); @@ -129,12 +124,10 @@ void oldtests::test_OStringBuffer() s2 = "Hier fuege ich jetzt ein > 123456789 false Hallo <\n"; TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 11"); -#ifndef SAL_OS2 b2.insert(26, m); b2.insert(26, " "); s2 = "Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"; TEST_ENSURE( s2 == b2.getStr(), "test_OStringBuffer error 12"); -#endif printf("test_OStringBuffer OK !!!\n"); return; @@ -187,12 +180,8 @@ void oldtests::test_OUStringBuffer() b2.append(n); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5"); -#ifndef SAL_OS2 #ifdef SAL_UNX sal_Int64 m = -3223372036854775807LL; -#elif defined(SAL_OS2) - sal_Int64 m; - sal_setInt64(&m, 3965190145L, -750499787L); #else sal_Int64 m = -3223372036854775807; #endif @@ -200,7 +189,6 @@ void oldtests::test_OUStringBuffer() b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); b2.append(m); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6"); -#endif OUString s2(b2.makeStringAndClear()); TEST_ENSURE( s1 == s2, "test_OWStringBuffer error 7"); @@ -223,12 +211,10 @@ void oldtests::test_OUStringBuffer() s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11"); -#ifndef SAL_OS2 b2.insert(26, m); b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12"); -#endif // ASCII-Schnittstelle, AB 15.10.1999 OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString"))); |