diff --git a/tests/utils/dotest.pp b/tests/utils/dotest.pp index 591ac018ba..5930fa5273 100644 --- a/tests/utils/dotest.pp +++ b/tests/utils/dotest.pp @@ -231,24 +231,6 @@ begin ForceExtension:=Copy(Hstr,1,j-1); end; -type - TCharSet = set of char; - -function GetToken(var s: string; Delims: TCharSet = [' ']):string; -var - i : longint; - p: PChar; -begin - p:=PChar(s); - i:=0; - while (p^ <> #0) and not (p^ in Delims) do begin - Inc(p); - Inc(i); - end; - GetToken:=Copy(s,1,i); - Delete(s,1,i+1); -end; - procedure mkdirtree(const s:string); var SErr, hs : string; diff --git a/tests/utils/testu.pp b/tests/utils/testu.pp index e19d64c276..ba659ecb99 100644 --- a/tests/utils/testu.pp +++ b/tests/utils/testu.pp @@ -12,6 +12,8 @@ uses ---------------------------------------------------------------------} type + TCharSet = set of char; + TVerboseLevel=(V_Abort,V_Error,V_Warning,V_Normal,V_Debug,V_SQL); TConfig = record @@ -79,9 +81,25 @@ Function SplitFileExt(const s:string):string; Function FileExists (Const F : String) : Boolean; Function PathExists (Const F : String) : Boolean; Function IsAbsolute (Const F : String) : boolean; +function GetToken(var s: string; Delims: TCharSet = [' ']):string; Implementation +function GetToken(var s: string; Delims: TCharSet = [' ']):string; +var + i : longint; + p: PChar; +begin + p:=PChar(s); + i:=0; + while (p^ <> #0) and not (p^ in Delims) do begin + Inc(p); + Inc(i); + end; + GetToken:=Copy(s,1,i); + Delete(s,1,i+1); +end; + function SplitPath(const s:string):string; var i : longint;