Forráskód Böngészése

* fixed some tests involving extended/double/currency after previous
optimization

git-svn-id: trunk@9039 -

Jonas Maebe 17 éve
szülő
commit
f56c2bcefc

+ 4 - 6
tests/test/cg/variants/tvarol157.pp

@@ -1,4 +1,3 @@
-{ %fail }
 {$ifndef bigfile}
 {$ifndef bigfile}
 {$ifdef fpc}
 {$ifdef fpc}
 {$mode delphi}
 {$mode delphi}
@@ -17,13 +16,12 @@ type
 procedure test157(a: double); overload;
 procedure test157(a: double); overload;
   begin
   begin
     writeln('double called instead of extended');
     writeln('double called instead of extended');
-    writeln('XXX')
   end;
   end;
 
 
 procedure test157(a: extended); overload;
 procedure test157(a: extended); overload;
   begin
   begin
     writeln('extended called instead of double');
     writeln('extended called instead of double');
-    writeln('YYY')
+    halt(1)
   end;
   end;
 
 
 var
 var
@@ -40,7 +38,7 @@ begin
     test157(v);
     test157(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('QQQ');
+      halt(1);
   end;
   end;
 
 
   try
   try
@@ -48,7 +46,7 @@ begin
     test157(v);
     test157(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('VVV');
+      halt(1);
   end;
   end;
 end;
 end;
 
 
@@ -57,5 +55,5 @@ end;
 end. {$endif not bigfile}
 end. {$endif not bigfile}
 {$else FPC_HAS_TYPE_EXTENDED}
 {$else FPC_HAS_TYPE_EXTENDED}
 begin
 begin
-end. {$endif not bigfile}
+end.
 {$endif FPC_HAS_TYPE_EXTENDED}
 {$endif FPC_HAS_TYPE_EXTENDED}

+ 4 - 6
tests/test/cg/variants/tvarol31.pp

@@ -1,4 +1,3 @@
-{ %fail }
 {$ifndef bigfile}
 {$ifndef bigfile}
 {$ifdef fpc}
 {$ifdef fpc}
 {$mode delphi}
 {$mode delphi}
@@ -17,13 +16,12 @@ type
 procedure test31(a: comp31); overload;
 procedure test31(a: comp31); overload;
   begin
   begin
     writeln('comp31 called instead of extended');
     writeln('comp31 called instead of extended');
-    writeln('XXX')
   end;
   end;
 
 
 procedure test31(a: extended); overload;
 procedure test31(a: extended); overload;
   begin
   begin
     writeln('extended called instead of comp31');
     writeln('extended called instead of comp31');
-    writeln('YYY')
+    halt(1)
   end;
   end;
 
 
 var
 var
@@ -40,7 +38,7 @@ begin
     test31(v);
     test31(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('QQQ');
+      halt(1);
   end;
   end;
 
 
   try
   try
@@ -48,7 +46,7 @@ begin
     test31(v);
     test31(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('VVV');
+      halt(1);
   end;
   end;
 end;
 end;
 
 
@@ -57,5 +55,5 @@ end;
 end. {$endif not bigfile}
 end. {$endif not bigfile}
 {$else FPC_HAS_TYPE_EXTENDED}
 {$else FPC_HAS_TYPE_EXTENDED}
 begin
 begin
-end. {$endif not bigfile}
+end.
 {$endif FPC_HAS_TYPE_EXTENDED}
 {$endif FPC_HAS_TYPE_EXTENDED}

+ 4 - 6
tests/test/cg/variants/tvarol62.pp

@@ -1,4 +1,3 @@
-{ %fail }
 {$ifndef bigfile}
 {$ifndef bigfile}
 {$ifdef fpc}
 {$ifdef fpc}
 {$mode delphi}
 {$mode delphi}
@@ -17,13 +16,12 @@ type
 procedure test62(a: currency); overload;
 procedure test62(a: currency); overload;
   begin
   begin
     writeln('currency called instead of extended');
     writeln('currency called instead of extended');
-    writeln('XXX')
   end;
   end;
 
 
 procedure test62(a: extended); overload;
 procedure test62(a: extended); overload;
   begin
   begin
     writeln('extended called instead of currency');
     writeln('extended called instead of currency');
-    writeln('YYY')
+    halt(1)
   end;
   end;
 
 
 var
 var
@@ -40,7 +38,7 @@ begin
     test62(v);
     test62(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('QQQ');
+      halt(1);
   end;
   end;
 
 
   try
   try
@@ -48,7 +46,7 @@ begin
     test62(v);
     test62(v);
   except
   except
     on E : TObject do
     on E : TObject do
-      writeln('VVV');
+      halt(1);
   end;
   end;
 end;
 end;
 
 
@@ -57,5 +55,5 @@ end;
 end. {$endif not bigfile}
 end. {$endif not bigfile}
 {$else FPC_HAS_TYPE_EXTENDED}
 {$else FPC_HAS_TYPE_EXTENDED}
 begin
 begin
-end. {$endif not bigfile}
+end.
 {$endif FPC_HAS_TYPE_EXTENDED}
 {$endif FPC_HAS_TYPE_EXTENDED}

+ 1 - 1
tests/utils/variants/genvartests.pp

@@ -127,7 +127,7 @@ begin
                (j=curridx) then
                (j=curridx) then
               { compilation has to fail }
               { compilation has to fail }
               writeln(t,'  abc');
               writeln(t,'  abc');
-            writeln(t,'end. {$endif not bigfile}');
+            writeln(t,'end.');
             writeln(t,'{$endif FPC_HAS_TYPE_EXTENDED}');
             writeln(t,'{$endif FPC_HAS_TYPE_EXTENDED}');
           end;
           end;