* use iosxwstr instead of cwstring on Darwin (for iOS 7+ testing)

git-svn-id: trunk@29829 -
2025-04-13 13:29:27 +02:00 · 2015-02-23 22:48:15 +00:00 · 2015-02-23 22:48:15 +00:00 · 3f5e95791b
commit 3f5e95791b
parent a56d94230f
61 changed files with 61 additions and 61 deletions
--- a/tests/test/talign2.pp
+++ b/tests/test/talign2.pp
@ -21,7 +21,7 @@ program talign2;
 {$ifdef fpc}
 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}
 {$endif}

--- a/tests/test/tcpstr1.pp
+++ b/tests/test/tcpstr1.pp
@ -1,6 +1,6 @@
 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 type
--- a/tests/test/tcpstr13.pp
+++ b/tests/test/tcpstr13.pp
@ -6,7 +6,7 @@ program tcpstr13;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 type
--- a/tests/test/tcpstr17.pp
+++ b/tests/test/tcpstr17.pp
@ -8,7 +8,7 @@ program tcpstr17;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 const
--- a/tests/test/tcpstr18.pp
+++ b/tests/test/tcpstr18.pp
@ -8,7 +8,7 @@ program tcpstr17;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 procedure TestRawByte(const Source: RawByteString; cp: word; const reason: integer);
--- a/tests/test/tcpstr19.pp
+++ b/tests/test/tcpstr19.pp
@ -12,7 +12,7 @@ program tcpstr19;
 {$endif}

 uses
-  {$ifdef unix} cwstring, {$endif}
+  {$ifdef unix} {$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif}
  SysUtils;
 var
  S: AnsiString;
--- a/tests/test/tcpstr9.pp
+++ b/tests/test/tcpstr9.pp
@ -2,7 +2,7 @@
 program tcpstr9;
 {$mode delphiunicode}
 {$apptype console}
-{$ifdef unix} uses cwstring; {$endif}
+{$ifdef unix} uses {$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$endif}
 begin
  // this test can be only run with the compiler built right now on the
  // same system
--- a/tests/test/tcpstransistr2shortstring.pp
+++ b/tests/test/tcpstransistr2shortstring.pp
@ -1,7 +1,7 @@
 {$apptype console}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tcpstransistr2widechararray.pp
+++ b/tests/test/tcpstransistr2widechararray.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tcpstransistr2widechararray2.pp
+++ b/tests/test/tcpstransistr2widechararray2.pp
@ -6,7 +6,7 @@

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}
 {$r+}
 var
--- a/tests/test/tcpstransistrcompare.pp
+++ b/tests/test/tcpstransistrcompare.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;
  
--- a/tests/test/tcpstransistrcompareequal.pp
+++ b/tests/test/tcpstransistrcompareequal.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;
  
--- a/tests/test/tcpstransistrcopy.pp
+++ b/tests/test/tcpstransistrcopy.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tcpstrchar2ansistr.pp
+++ b/tests/test/tcpstrchar2ansistr.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tcpstrconcat.pp
+++ b/tests/test/tcpstrconcat.pp
@ -1,7 +1,7 @@
 {$APPTYPE CONSOLE}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/tcpstrconcat2.pp
+++ b/tests/test/tcpstrconcat2.pp
@ -1,7 +1,7 @@
 {$APPTYPE CONSOLE}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/tcpstrconcat3.pp
+++ b/tests/test/tcpstrconcat3.pp
@ -1,7 +1,7 @@
 {$APPTYPE CONSOLE}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;
  
--- a/tests/test/tcpstrconcatmulti.pp
+++ b/tests/test/tcpstrconcatmulti.pp
@ -2,7 +2,7 @@
 // test "fpc_AnsiStr_Concat_multi" with a same type(same encoding) 
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;
  
--- a/tests/test/tcpstrconcatmulti2.pp
+++ b/tests/test/tcpstrconcatmulti2.pp
@ -2,7 +2,7 @@
 // test "fpc_AnsiStr_Concat_multi" with a differant types(encodings) 
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/tcpstrpchar2ansistr.pp
+++ b/tests/test/tcpstrpchar2ansistr.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tcpstrsetlength.pp
+++ b/tests/test/tcpstrsetlength.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/tcpstrsetlength2.pp
+++ b/tests/test/tcpstrsetlength2.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/tcpstrshortstr2ansistr.pp
+++ b/tests/test/tcpstrshortstr2ansistr.pp
@ -1,7 +1,7 @@
 {$mode objfpc} {$H+}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;
  
--- a/tests/test/tstrutils1.pp
+++ b/tests/test/tstrutils1.pp
@ -8,7 +8,7 @@ program tstrutils1;
 uses
  {SysUtils, }
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  StrUtils;

--- a/tests/test/tstrutils2.pp
+++ b/tests/test/tstrutils2.pp
@ -10,7 +10,7 @@ program tstrutils2;
 uses
  StrUtils
 {$ifdef unix}
-  ,cwstring
+  ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif}
 {$endif unix}
  ;

--- a/tests/test/tunistr1.pp
+++ b/tests/test/tunistr1.pp
@ -1,6 +1,6 @@
 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif unix}

 var
--- a/tests/test/tunistr2.pp
+++ b/tests/test/tunistr2.pp
@ -1,6 +1,6 @@
 {$ifdef UNIX}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif UNIX}

 var
--- a/tests/test/tunistr4.pp
+++ b/tests/test/tunistr4.pp
@ -5,7 +5,7 @@

 uses
 {$ifdef unix}
-  cthreads, cwstring,
+  cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  Classes, SysUtils;

--- a/tests/test/tunistr6.pp
+++ b/tests/test/tunistr6.pp
@ -2,7 +2,7 @@
 {$codepage utf-8}
 uses
  {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif}
  sysutils;

--- a/tests/test/tunistr7.pp
+++ b/tests/test/tunistr7.pp
@ -2,7 +2,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;

--- a/tests/test/twide1.pp
+++ b/tests/test/twide1.pp
@ -1,6 +1,6 @@
 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif unix}
  
 var
--- a/tests/test/twide2.pp
+++ b/tests/test/twide2.pp
@ -1,6 +1,6 @@
 {$ifdef UNIX}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif UNIX}

 var
--- a/tests/test/twide3.pp
+++ b/tests/test/twide3.pp
@ -8,7 +8,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  SysUtils;

--- a/tests/test/twide4.pp
+++ b/tests/test/twide4.pp
@ -5,7 +5,7 @@

 uses
 {$ifdef unix}
-  cthreads, cwstring,
+  cthreads, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  Classes, SysUtils;

--- a/tests/test/twide6.pp
+++ b/tests/test/twide6.pp
@ -2,7 +2,7 @@
 {$codepage utf-8}
 uses
 {$ifdef unix}
- cwstring,
+ {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  sysutils;

--- a/tests/test/twide7.pp
+++ b/tests/test/twide7.pp
@ -2,7 +2,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  sysutils;

--- a/tests/test/twrstr9.pp
+++ b/tests/test/twrstr9.pp
@ -2,7 +2,7 @@

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 type
--- a/tests/test/units/system/tdir2.pp
+++ b/tests/test/units/system/tdir2.pp
@ -15,7 +15,7 @@ Program tdir;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 procedure test(value, required: longint);
--- a/tests/test/units/system/tfiledir.pp
+++ b/tests/test/units/system/tfiledir.pp
@ -3,7 +3,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  sysutils;

--- a/tests/test/units/sysutils/tastrcmp.pp
+++ b/tests/test/units/sysutils/tastrcmp.pp
@ -26,7 +26,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/units/sysutils/tfexpand2.pp
+++ b/tests/test/units/sysutils/tfexpand2.pp
@ -28,7 +28,7 @@ uses
 PopupErr,
 {$endif FPC}
 {$ifdef unix}
- cwstring,
+ {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
 SysUtils;

--- a/tests/test/units/sysutils/tffirst.pp
+++ b/tests/test/units/sysutils/tffirst.pp
@ -4,7 +4,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  SysUtils;

--- a/tests/test/units/sysutils/tlocale.pp
+++ b/tests/test/units/sysutils/tlocale.pp
@ -2,7 +2,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  clocale,
 {$endif}
  SysUtils;
--- a/tests/test/units/sysutils/tstrcmp.pp
+++ b/tests/test/units/sysutils/tstrcmp.pp
@ -26,7 +26,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/test/units/sysutils/tunifile.pp
+++ b/tests/test/units/sysutils/tunifile.pp
@ -3,7 +3,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  sysutils;

--- a/tests/test/units/sysutils/twstrcmp.pp
+++ b/tests/test/units/sysutils/twstrcmp.pp
@ -27,7 +27,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif unix}
  SysUtils;

--- a/tests/webtbs/tw10482.pp
+++ b/tests/webtbs/tw10482.pp
@ -4,7 +4,7 @@ program fpctest4;
 {$endif fpc}
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  Classes,sysutils,variants,typinfo;

--- a/tests/webtbs/tw11791.pp
+++ b/tests/webtbs/tw11791.pp
@ -1,7 +1,7 @@
 {$mode objfpc}{$H+}

 uses
-{$ifdef unix}cwstring,{$endif}
+{$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}
 Classes, SysUtils;


--- a/tests/webtbs/tw12993.pp
+++ b/tests/webtbs/tw12993.pp
@ -2,7 +2,7 @@

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}
 var
  s: ansistring;
--- a/tests/webtbs/tw13015.pp
+++ b/tests/webtbs/tw13015.pp
@ -9,7 +9,7 @@ program test;

 uses
 {$ifdef unix}
- cwstring,
+ {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
 Classes,SysUtils,uw13015;

--- a/tests/webtbs/tw13075.pp
+++ b/tests/webtbs/tw13075.pp
@ -3,7 +3,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  Classes, SysUtils;

--- a/tests/webtbs/tw17591.pp
+++ b/tests/webtbs/tw17591.pp
@ -4,7 +4,7 @@ program comparetext;
 uses
 sysutils
 {$ifdef unix}
- ,cwstring
+ ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif}
 {$endif}
 ;
 var
--- a/tests/webtbs/tw20962.pp
+++ b/tests/webtbs/tw20962.pp
@ -4,7 +4,7 @@ program outpar;
 {$ifdef FPC}{$mode objfpc}{$h+}{$endif}
 {$ifdef mswindows}{$apptype console}{$endif}
 uses
- {$ifdef FPC}{$ifdef unix}cthreads,cwstring,{$endif}{$endif}
+ {$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif}
 sysutils;
 {$ifndef FPC}
 type
--- a/tests/webtbs/tw25198.pp
+++ b/tests/webtbs/tw25198.pp
@ -5,7 +5,7 @@ program concatenate_resourestrings_delphiunicode;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif}

 resourcestring
--- a/tests/webtbs/tw3235a.pp
+++ b/tests/webtbs/tw3235a.pp
@ -1,6 +1,6 @@
 program TestStrIComp;
  uses
-    {$ifdef unix}cwstring,{$endif}
+    {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}
    SysUtils;

 var l: longint;
--- a/tests/webtbs/tw3697.pp
+++ b/tests/webtbs/tw3697.pp
@ -2,7 +2,7 @@
 { Submitted by "Matthias Hryniszak" on  2005-02-26 }
 { e-mail: matthias@hryniszak.de }
 uses
-  {$ifdef unix}cwstring, {$endif}SysUtils;
+  {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$endif}SysUtils;

 var
  S: WideString;
--- a/tests/webtbs/tw4080.pp
+++ b/tests/webtbs/tw4080.pp
@ -3,7 +3,7 @@ program tw4080;

 {$ifdef unix}
 uses
-  cwstring;
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
 {$endif unix}

 var
--- a/tests/webtbs/tw7006.pp
+++ b/tests/webtbs/tw7006.pp
@ -2,7 +2,7 @@ program av;
 {$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif}
 {$ifdef mswindows}{$apptype console}{$endif}
 uses
- {$ifdef FPC}{$ifdef unix}cthreads,cwstring,{$endif}{$endif}sysutils;
+ {$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif}sysutils;
 type
 testrecty = record
  str: widestring;
--- a/tests/webtbs/tw7758.pp
+++ b/tests/webtbs/tw7758.pp
@ -2,7 +2,7 @@

 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  sysutils;

--- a/tests/webtbs/tw7758a.pp
+++ b/tests/webtbs/tw7758a.pp
@ -2,7 +2,7 @@

 uses
  {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
  {$endif}
  sysutils;

--- a/tests/webtbs/tw9161.pp
+++ b/tests/webtbs/tw9161.pp
@ -1,6 +1,6 @@
 uses
 {$ifdef unix}
-  cwstring,
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
 {$endif}
  variants,sysutils;
 var a:variant;