Browse Source

* replaced test directory names with ones that doesn't contain decomposable
characters, so the test's success doesn't depend on getdir returning a
string using the same composition as the used name (fixes test on
OS X 10.11)

git-svn-id: trunk@33270 -

Jonas Maebe 9 years ago
parent
commit
697aed738c
2 changed files with 4 additions and 4 deletions
  1. 2 2
      tests/test/units/system/tdir2.pp
  2. 2 2
      tests/test/units/sysutils/tfexpand2.pp

+ 2 - 2
tests/test/units/system/tdir2.pp

@@ -30,7 +30,7 @@ end;
 
 procedure testansi;
 const
-  dirname: utf8string = '鿆®';
+  dirname: utf8string = 'œ≈†®';
 var
   orgdir, newdir: rawbytestring;
 Begin
@@ -79,7 +79,7 @@ end;
 
 procedure testuni;
 const
-  dirname: unicodestring = '鿆®';
+  dirname: unicodestring = 'œ≈†®';
 var
   orgdir, newdir: unicodestring;
 Begin

+ 2 - 2
tests/test/units/sysutils/tfexpand2.pp

@@ -117,8 +117,8 @@ const
   {$ENDIF MACOS}
  {$ENDIF UNIX}
 {$ENDIF FPC}
- TestFileName = UTF8String('™estfilê.™st');
- TestDir1Name = UTF8String('TÊS™DIR1');
+ TestFileName = UTF8String('™estfil.™st');
+ TestDir1Name = UTF8String('TS™DIR1');
  TestDir2Name = UTF8String('TE∑™DIR2');
  HasErrors: boolean = false;