Explorar o código

* fixed tests for architectures with FPC_COMP_IS_INT64 defined

git-svn-id: trunk@44222 -
(cherry picked from commit 66aa2e1416e53e42ce5593ea5c71e244fd3dbb4e)
florian %!s(int64=5) %!d(string=hai) anos
pai
achega
3060799961
Modificáronse 2 ficheiros con 21 adicións e 1 borrados
  1. 17 1
      tests/tbs/tb0621.pp
  2. 4 0
      tests/test/units/fpcunit/testcomps.pp

+ 17 - 1
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. 

+ 4 - 0
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 }