paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 05:49:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore default for OS and CPU to All ID and increase max size of comboBox to 100

Browse Source 
git-svn-id: trunk@29672 -
This commit is contained in:
pierre 2015-02-11 21:51:53 +00:00
parent 8c20ff7f91
commit a02344e978
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/utils/testsuite/utests.pp
View File

@ -89,7 +89,9 @@ Type
Procedure ComboBoxFromQuery(Const ComboName,Qry,Value : String); Procedure ComboBoxFromQuery(Const ComboName,Qry,Value : String);
Function GetSingleTon(Const Qry : String) : String; Function GetSingleTon(Const Qry : String) : String;
Function GetOSName(ID : String) : String; Function GetOSName(ID : String) : String;
Function GetOSID(AName : String) : String;
Function GetCPUName(ID : String) : String; Function GetCPUName(ID : String) : String;
Function GetCPUID(AName : String) : String;
Function GetVersionName(ID : String) : String; Function GetVersionName(ID : String) : String;
Function GetCategoryName(ID : String) : String; Function GetCategoryName(ID : String) : String;
Function GetTestFileName(ID : String) : String; Function GetTestFileName(ID : String) : String;
@ -202,7 +204,10 @@ type
ver_2_6_3, ver_2_6_3,
ver_2_6_4, ver_2_6_4,
ver_2_6_5, ver_2_6_5,
ver_2_7_1); ver_2_7_1,
ver_3_0_0,
ver_3_0_1,
ver_3_1_1);
const const
ver_trunk = high (known_versions); ver_trunk = high (known_versions);
@ -240,7 +245,10 @@ const
'2.6.3', '2.6.3',
'2.6.4', '2.6.4',
'2.6.5', '2.6.5',
'2.7.1' '2.7.1',
'3.0.0',
'3.0.1',
'3.1.1'
); );
ver_branch : array [known_versions] of string = ver_branch : array [known_versions] of string =
@ -275,6 +283,9 @@ const
'tags/release_2_6_4', 'tags/release_2_6_4',
'tags/release_2_6_4', 'tags/release_2_6_4',
'branches/fixes_2_6', 'branches/fixes_2_6',
'trunk',
'branches/release_3_0_0',
'branches/fixes_3_0',
'trunk' 'trunk'
); );
@ -460,6 +471,12 @@ begin
FDB.Transaction := FTrans; FDB.Transaction := FTrans;
FDB.Connected:=True; FDB.Connected:=True;
Result:=True; Result:=True;
{ All is not the first anymore, we need to put it by default explicity }
if Length(FOS) = 0 then
FOS:=GetOSID('All');
{ All is not the first anymore, we need to put it by default explicity }
if Length(FCPU) = 0 then
FCPU:=GetCPUID('All');
end; end;
procedure TTestsuite.LDump(Const St : String); procedure TTestsuite.LDump(Const St : String);
@ -1010,6 +1027,15 @@ begin
Result:=''; Result:='';
end; end;
Function TTestSuite.GetOSID(AName : String) : String;
begin
if (AName<>'') then
Result:=GetSingleTon('SELECT TO_ID FROM TESTOS WHERE TO_NAME='''+Aname+'''')
else
Result:='';
end;
Function TTestSuite.GetTestFileName(ID : String) : String; Function TTestSuite.GetTestFileName(ID : String) : String;
begin begin
@ -1036,6 +1062,15 @@ begin
Result:=''; Result:='';
end; end;
Function TTestSuite.GetCPUID(AName : String) : String;
begin
if (AName<>'') then
Result:=GetSingleTon('SELECT TC_ID FROM TESTCPU WHERE TC_NAME='''+AName+'''')
else
Result:='';
end;
Function TTestSuite.GetVersionName(ID : String) : String; Function TTestSuite.GetVersionName(ID : String) : String;
begin begin
@ -1785,7 +1820,8 @@ end;
Procedure TTestSuite.ShowHistory; Procedure TTestSuite.ShowHistory;
Const Const
MaxCombo = 50; { We already have 53 versions }
MaxCombo = 100;
Type Type
StatusLongintArray = Array [TTestStatus] of longint; StatusLongintArray = Array [TTestStatus] of longint;