paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-24 12:21:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix date of testsuite run. It must now be passed using YYYYMMDDhhmm

Browse Source 
* Add verbose parameter

git-svn-id: trunk@150 -
This commit is contained in:
fpc 2005-05-29 21:18:46 +00:00
parent 70fbf3bf17
commit 4a19b90c8d
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/utils/dbdigest.pp
View File

@ -146,12 +146,8 @@ Const
Var Var
StatusCount : Array[TTestStatus] of Integer; StatusCount : Array[TTestStatus] of Integer;
UnknownLines, UnknownLines : integer;
unexpected_run : Integer;
next_should_be_run : boolean;
var
prevline : string;
Procedure ExtractTestFileName(Var Line : string); Procedure ExtractTestFileName(Var Line : string);
@ -167,7 +163,6 @@ Function Analyse(Var Line : string; Var Status : TTestStatus) : Boolean;
Var Var
TS : TTestStatus; TS : TTestStatus;
Found : Boolean;
begin begin
Result:=False; Result:=False;
@ -199,7 +194,8 @@ TConfigOpt = (
coSubmitter, coSubmitter,
coMachine, coMachine,
coComment, coComment,
coTestSrcDir coTestSrcDir,
coVerbose
); );
Const Const
@ -217,11 +213,12 @@ ConfigStrings : Array [TConfigOpt] of string = (
'submitter', 'submitter',
'machine', 'machine',
'comment', 'comment',
'testsrcdir' 'testsrcdir',
'verbose'
); );
ConfigOpts : Array[TConfigOpt] of char ConfigOpts : Array[TConfigOpt] of char
= ('d','h','u','p','l','o','c','v','t','s','m','C','S'); = ('d','h','u','p','l','o','c','v','t','s','m','C','S','V');
Var Var
TestOS, TestOS,
@ -238,7 +235,8 @@ Var
TestDate : TDateTime; TestDate : TDateTime;
Procedure SetOpt (O : TConfigOpt; Value : string); Procedure SetOpt (O : TConfigOpt; Value : string);
var
year,month,day,min,hour : word;
begin begin
Case O of Case O of
coDatabaseName : DatabaseName:=Value; coDatabaseName : DatabaseName:=Value;
@ -249,10 +247,25 @@ begin
coOS : TestOS:=Value; coOS : TestOS:=Value;
coCPU : TestCPU:=Value; coCPU : TestCPU:=Value;
coVersion : TestVersion:=Value; coVersion : TestVersion:=Value;
coDate : TestDate:=StrToDate(Value); coDate :
begin
{ Formated like YYYYMMDDhhmm }
if Length(value)=12 then
begin
year:=StrToInt(Copy(value,1,4));
month:=StrToInt(Copy(value,5,2));
day:=StrToInt(Copy(Value,7,2));
hour:=StrToInt(Copy(Value,9,2));
min:=StrToInt(Copy(Value,11,2));
TestDate:=EncodeDate(year,month,day)+EncodeTime(hour,min,0,0);
end
else
Verbose(V_Error,'Error in date format, use YYYYMMDDhhmm');
end;
coSubmitter : Submitter:=Value; coSubmitter : Submitter:=Value;
coMachine : Machine:=Value; coMachine : Machine:=Value;
coComment : Comment:=Value; coComment : Comment:=Value;
coVerbose : DoVerbose:=true;
coTestSrcDir : coTestSrcDir :
begin begin
TestSrcDir:=Value; TestSrcDir:=Value;
@ -267,8 +280,7 @@ Function ProcessOption(S: String) : Boolean;
Var Var
N : String; N : String;
I : Integer; I : Integer;
Found : Boolean; co : TConfigOpt;
co,o : TConfigOpt;
begin begin
Verbose(V_DEBUG,'Processing option: '+S); Verbose(V_DEBUG,'Processing option: '+S);
@ -282,10 +294,7 @@ begin
begin begin
Result:=CompareText(ConfigStrings[co],N)=0; Result:=CompareText(ConfigStrings[co],N)=0;
If Result then If Result then
begin
o:=co;
Break; Break;
end;
end; end;
end; end;
If Result then If Result then
@ -328,7 +337,7 @@ Procedure ProcessCommandLine;
Var Var
I : Integer; I : Integer;
O,V : String; O : String;
c,co : TConfigOpt; c,co : TConfigOpt;
Found : Boolean; Found : Boolean;
@ -460,7 +469,7 @@ procedure UpdateTestRun;
qry:='UPDATE TESTRUN SET '; qry:='UPDATE TESTRUN SET ';
for i:=low(TTestStatus) to high(TTestStatus) do for i:=low(TTestStatus) to high(TTestStatus) do
qry:=qry+format('%s=%d, ',[SQLField[i],StatusCount[i]]); qry:=qry+format('%s=%d, ',[SQLField[i],StatusCount[i]]);
qry:=qry+format('TU_SUBMITTER="%s", TU_MACHINE="%s", TU_COMMENT="%s"',[Submitter,Machine,Comment]); qry:=qry+format('TU_SUBMITTER="%s", TU_MACHINE="%s", TU_COMMENT="%s", TU_DATE="%s"',[Submitter,Machine,Comment,SqlDate(TestDate)]);
qry:=qry+' WHERE TU_ID='+format('%d',[TestRunID]); qry:=qry+' WHERE TU_ID='+format('%d',[TestRunID]);
RunQuery(Qry,res) RunQuery(Qry,res)
end; end;