paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 17:19:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix compilation of RunTests project with a recent FPC.

Browse Source 
git-svn-id: trunk@63331 -
This commit is contained in:
juha 2020-06-09 11:43:46 +00:00
parent 4fc42c5a77
commit f448417081
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/bugs/bug8432.pas
View File

@ -119,7 +119,7 @@ begin
begin begin
ID1 := 1 shl 32; AInt:=10; ID1 := 1 shl 32; AInt:=10;
Add(ID1, AInt); Add(ID1, AInt);
AssertEquals('Wrong ID1', $100000000, ID1); AssertEquals('Wrong ID1', QWord($100000000), ID1);
ID2 := 2 shl 32; AInt:=20; ID2 := 2 shl 32; AInt:=20;
Add(ID2, AInt); Add(ID2, AInt);
ID3 := 3 shl 32; AInt:=30; ID3 := 3 shl 32; AInt:=30;

2
test/lcltests/testlistview.pas
View File

@ -545,8 +545,10 @@ begin
FTestMouseInput.Up(FButton, FShiftUp, FUpPos.x, FupPos.y); FTestMouseInput.Up(FButton, FShiftUp, FUpPos.x, FupPos.y);
WaitForMain; WaitForMain;
{$IFDEF WINDOWS}
FTestMouseInput.UnApplyKey([ssShift, ssCtrl]); FTestMouseInput.UnApplyKey([ssShift, ssCtrl]);
WaitForMain; WaitForMain;
{$ENDIF}
for i := 0 to length(FClick2Pos) - 1 do begin for i := 0 to length(FClick2Pos) - 1 do begin
FTestMouseInput.Down(FClick2Pos[i].btn, [], FClick2Pos[i].x, FClick2Pos[i].y); FTestMouseInput.Down(FClick2Pos[i].btn, [], FClick2Pos[i].x, FClick2Pos[i].y);

2
test/lcltests/testpen.pas
View File

@ -67,7 +67,7 @@ begin
AssertEquals('Pen Style is not equal', PenStyle, ExtPen^.elpPenStyle); AssertEquals('Pen Style is not equal', PenStyle, ExtPen^.elpPenStyle);
AssertEquals('Pen Width is not equal', PenWidth, ExtPen^.elpWidth); AssertEquals('Pen Width is not equal', PenWidth, ExtPen^.elpWidth);
AssertEquals('Pen Color is not equal', lb.lbColor, ExtPen^.elpColor); AssertEquals('Pen Color is not equal', lb.lbColor, ExtPen^.elpColor);
AssertEquals('Pen Hatch is not equal', lb.lbHatch, ExtPen^.elpHatch); AssertEquals('Pen Hatch is not equal', lb.lbHatch, QWord(ExtPen^.elpHatch));
AssertEquals('Pen Brush Style is not equal', lb.lbStyle, ExtPen^.elpBrushStyle); AssertEquals('Pen Brush Style is not equal', lb.lbStyle, ExtPen^.elpBrushStyle);
AssertEquals('Pen Dashes Count is not equal', Length(Dashes), ExtPen^.elpNumEntries); AssertEquals('Pen Dashes Count is not equal', Length(Dashes), ExtPen^.elpNumEntries);
AssertTrue('Pen Dashes are not equal', CompareDWord(Dashes[0], ExtPen^.elpStyleEntry[0], ExtPen^.elpNumEntries)=0); AssertTrue('Pen Dashes are not equal', CompareDWord(Dashes[0], ExtPen^.elpStyleEntry[0], ExtPen^.elpNumEntries)=0);

9
test/runtests.lpi
View File

@ -68,7 +68,7 @@
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="4"> <RequiredPackages Count="5">
<Item1> <Item1>
<PackageName Value="CodeTools"/> <PackageName Value="CodeTools"/>
</Item1> </Item1>
@ -76,11 +76,14 @@
<PackageName Value="FCL"/> <PackageName Value="FCL"/>
</Item2> </Item2>
<Item3> <Item3>
<PackageName Value="fpcunitconsolerunner"/> <PackageName Value="LCL"/>
</Item3> </Item3>
<Item4> <Item4>
<PackageName Value="LCL"/> <PackageName Value="fpcunitconsolerunner"/>
</Item4> </Item4>
<Item5>
<PackageName Value="lazmouseandkeyinput"/>
</Item5>
</RequiredPackages> </RequiredPackages>
<Units Count="13"> <Units Count="13">
<Unit0> <Unit0>

13
test/runtests.lpr
View File

@ -21,11 +21,14 @@ program runtests;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
uses uses
{$IFDEF UNIX}
cthreads,
{$ENDIF}
Classes, consoletestrunner, Classes, consoletestrunner,
testglobals, testunits, dom, testglobals, testunits, dom,
{Unit needed to set the LCL version and widget set name} {Unit needed to set the LCL version and widget set name}
LCLVersion, InterfaceBase, LCLPlatformDef, Interfaces, TestLazXML, LCLVersion, InterfaceBase, LCLPlatformDef, lazmouseandkeyinput, Interfaces,
TestAvgLvlTree, TestLConvEncoding, testlazfileutils; TestLazXML, TestAvgLvlTree, TestLConvEncoding, testlazfileutils;
type type
@ -37,7 +40,7 @@ type
FMachine: string; FMachine: string;
protected protected
procedure AppendLongOpts; override; procedure AppendLongOpts; override;
procedure ParseOptions; override; function ParseOptions: Boolean; override;
procedure WriteCustomHelp; override; procedure WriteCustomHelp; override;
procedure ExtendXmlDocument(Doc: TXMLDocument); override; procedure ExtendXmlDocument(Doc: TXMLDocument); override;
@ -54,9 +57,9 @@ begin
LongOpts.Add('submitter:'); LongOpts.Add('submitter:');
end; end;
procedure TLazTestRunner.ParseOptions; function TLazTestRunner.ParseOptions: Boolean;
begin begin
inherited ParseOptions; Result := inherited ParseOptions;
if HasOption('compiler') then if HasOption('compiler') then
Compiler := GetOptionValue('compiler'); Compiler := GetOptionValue('compiler');
if HasOption('pcp') then if HasOption('pcp') then