From 66aa2e1416e53e42ce5593ea5c71e244fd3dbb4e Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 20 Feb 2020 20:51:46 +0000 Subject: [PATCH] * fixed tests for architectures with FPC_COMP_IS_INT64 defined git-svn-id: trunk@44222 - --- tests/tbs/tb0621.pp | 18 +++++++++++++++++- tests/test/units/fpcunit/testcomps.pp | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/tbs/tb0621.pp b/tests/tbs/tb0621.pp index 7d1f76a47b..ee08c2bdf3 100644 --- a/tests/tbs/tb0621.pp +++ b/tests/tbs/tb0621.pp @@ -7,7 +7,22 @@ VAR x1, x2 : comp; Markus Greim / 29.jun.2016 *) BEGIN - +{$ifdef FPC_COMP_IS_INT64} +x1 := 8; +writeln('x1 : ',x1); +x2 := round(x1 / 2); +writeln('x2 = x1/2 should be 4 but is : ', x2); +if x2<>4 then + halt(1); +x2 := round(x1 / 4); +writeln('x2 = x1/4 should be 2 but is : ', x2); +if x2<>2 then + halt(2); +x2 := round(x1 / 8); +writeln('x2 = x1/8 should be 1 and is : ', x2); +if x2<>1 then + halt(3); +{$else FPC_COMP_IS_INT64} x1 := 8; writeln('x1 : ',x1); x2 := x1 / 2; @@ -22,6 +37,7 @@ x2 := x1 / 8; writeln('x2 = x1/8 should be 1 and is : ', x2); if x2<>1 then halt(3); +{$endif FPC_COMP_IS_INT64} END. diff --git a/tests/test/units/fpcunit/testcomps.pp b/tests/test/units/fpcunit/testcomps.pp index 8784083932..9a0d053d20 100644 --- a/tests/test/units/fpcunit/testcomps.pp +++ b/tests/test/units/fpcunit/testcomps.pp @@ -628,7 +628,11 @@ end; constructor TCompComponent.Create(AOwner: TComponent); begin inherited; +{$ifdef FPC_COMP_IS_INT64} + F:=round(4.56); +{$else FPC_COMP_IS_INT64} F:=4.56; +{$endif FPC_COMP_IS_INT64} end; { TCurrencyComponent }