paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-09 20:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* ignore case of drive letter

Browse Source 
git-svn-id: trunk@14841 -
This commit is contained in:
pierre 2010-02-01 16:52:19 +00:00
parent a989b6c1e6
commit 0cfcd70ad0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test/units/dos/tfexpand.pp
View File

@ -185,7 +185,8 @@ begin
if (Length (S) > 1) and (S [2] = ':') then Delete (S, 1, 2); if (Length (S) > 1) and (S [2] = ':') then Delete (S, 1, 2);
{$ELSE UNIX} {$ELSE UNIX}
for I := 1 to Length (S) do if S [I] = '/' then S [I] := DirSep; for I := 1 to Length (S) do if S [I] = '/' then S [I] := DirSep;
if (Length (S) > 0) and (S [1] in ['a'..'z']) then S [1] := UpCase (S [1]); if (Length (S) > 1) and (S [1] in ['a'..'z']) and (S[2]=DriveSep) then
S [1] := UpCase (S [1]);
{$ENDIF UNIX} {$ENDIF UNIX}
if not (FileNameCaseSensitive) then if not (FileNameCaseSensitive) then
for I := 1 to Length (S) do S [I] := UpCase (S [I]); for I := 1 to Length (S) do S [I] := UpCase (S [I]);
@ -201,6 +202,10 @@ begin
{$ENDIF DEBUG} {$ENDIF DEBUG}
Rslt := Translate (Rslt); Rslt := Translate (Rslt);
Rslt2 := FExpand (Src); Rslt2 := FExpand (Src);
{$IFNDEF UNIX}
if (Length (Rslt2) > 1) and (Rslt2 [1] in ['a'..'z']) and (Rslt2[2]=DriveSep) then
Rslt2 [1] := UpCase (Rslt2 [1]);
{$ENDIF NDEF UNIX}
if Rslt <> Rslt2 then if Rslt <> Rslt2 then
begin begin
WriteLn ('Error: FExpand (', Src, ') should be "', Rslt, '", not "', WriteLn ('Error: FExpand (', Src, ') should be "', Rslt, '", not "',
@ -389,13 +394,14 @@ if CDir [Length (CDir)] = DirSep then Check ('c:anything', CDir + 'anything')
Check (TestDrive + '.' + DirSep + '.', CurDir); Check (TestDrive + '.' + DirSep + '.', CurDir);
Check (TestDrive + '.' + DirSep + '..', TestDir + TestDir1Name); Check (TestDrive + '.' + DirSep + '..', TestDir + TestDir1Name);
{$I-} {$I-}
{ $ ifndef unix (*
{ avoid a and b drives for { $ ifndef unix }
{ avoid a and b drives for
no unix systems to reduce the no unix systems to reduce the
probablility of getting an alert message box } probablility of getting an alert message box }
(* This should not be needed - unit popuperr should solve this?! TH *) { This should not be needed - unit popuperr should solve this?! TH }
I := 3; I := 3;
$else unix} {$else unix} *)
I := 1; I := 1;
{ $ endif unix} { $ endif unix}
repeat repeat