浏览代码

Fix for failures on FileNameCaseSensitive systems

git-svn-id: trunk@29609 -
pierre 10 年之前
父节点
当前提交
488024ea5c
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      tests/test/units/sysutils/texpfncase.pp

+ 3 - 2
tests/test/units/sysutils/texpfncase.pp

@@ -57,8 +57,9 @@ var
   Match: TFilenameCaseMatch;
 begin
   FN2 := ExpandFileNameCase (FN1, Match);
-  if ((ExpReturn <> '') and (FN2 <> ExpReturn) or (Match <> ExpMatch)) and
-     not(FileNameCaseSensitive and (Match=mkAmbiguous) and (UpperCase(FN2)<>UpperCase(ExpReturn)))  then
+  if (Match <> ExpMatch) or ((ExpReturn <> '') and (FN2 <> ExpReturn) and
+     ((Match <> mkAmbiguous) or not (FileNameCaseSensitive) or
+                               (UpperCase (FN2) <> UpperCase (ExpReturn)))) then
    begin
     Inc (Failed);
     WriteLn ('Error: Input = ', FN1, ', Output = ', FN2, ' (expected ', ExpReturn, '), MatchFound = ',