Use USE_INTERNAL_UNICODE to be able to test fpwidestrings on different targets

git-svn-id: trunk@38758 -

tests/test/tunistr6.pp

@@ -1,20 +1,27 @@
 {%skiptarget=wince}
 {$codepage utf-8}
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
-
 uses
-  {$ifdef unix}
+ {$ifndef USE_INTERNAL_UNICODE}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
-  {$endif}
-  {$ifdef USE_FPWIDESTRING_UNIT}
+ {$endif ndef USE_INTERNAL_UNICODE}
+ {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
-  {$endif}
-  {$ifdef USE_UNICODEDUCET_UNIT}
+ {$endif}
+ {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
-  {$endif}
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
+ {$endif}
   sysutils;
 
 procedure doerror(i : integer);

tests/test/tunistr7.pp

@@ -1,19 +1,26 @@
 {$codepage utf-8}
 
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
-
 uses
-{$ifdef unix}
+ {$ifndef USE_INTERNAL_UNICODE}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
-{$endif unix}
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
  {$endif}
   sysutils;
 

tests/test/twide1.pp

@@ -1,18 +1,26 @@
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
 uses
- {$ifdef unix}
- {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
- {$endif}
+ {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
-  unicodeducet;
+  unicodeducet,
  {$endif}
-
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
+ {$endif}
+  strings;
   
 var
   w : widestring;

tests/test/twide2.pp

@@ -1,17 +1,26 @@
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
 uses
- {$ifdef unix}
- {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
- {$endif}
+ {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
-  unicodeducet;
+  unicodeducet,
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
  {$endif}
+  strings;
 
 var
   i : longint;

tests/test/twide4.pp

@@ -4,18 +4,26 @@
 {$endif fpc}
 
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
 uses
- {$ifdef unix}
- {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
- {$endif}
+ {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
  {$endif}
   Classes, SysUtils;
 

tests/test/twide6.pp

@@ -2,18 +2,26 @@
 {$codepage utf-8}
 
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
 uses
- {$ifdef unix}
- {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
- {$endif}
+ {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
  {$endif}
   sysutils;
 

tests/test/twide7.pp

@@ -1,18 +1,26 @@
 {$codepage utf-8}
 
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
 uses
-{$ifdef unix}
+ {$ifndef USE_INTERNAL_UNICODE}
   {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
-{$endif unix}
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
+ {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
  {$endif}
   sysutils;
 

tests/test/twrstr9.pp

@@ -1,21 +1,27 @@
 {$codepage utf8}
 
 {$ifdef go32v2}
+  {$define USE_INTERNAL_UNICODE}
+{$endif}
+
+{$ifdef USE_INTERNAL_UNICODE}
   {$define USE_FPWIDESTRING_UNIT}
   {$define USE_UNICODEDUCET_UNIT}
+  {$define USE_CPALL_UNIT}
 {$endif}
-
-{$ifdef unix}
-uses
-  {$ifdef darwin}iosxwstr{$else}cwstring{$endif};
-{$else}
 uses
+ {$ifndef USE_INTERNAL_UNICODE}
+  {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
+ {$endif ndef USE_INTERNAL_UNICODE}
  {$ifdef USE_FPWIDESTRING_UNIT}
   fpwidestring,
  {$endif}
  {$ifdef USE_UNICODEDUCET_UNIT}
   unicodeducet,
  {$endif}
+ {$ifdef USE_CPALL_UNIT}
+  cpall,
+ {$endif}
  { The unit strings is not really used here,
    but simpifies the conditional construction
    for fpwidestring and unicodeducet use }