* Fixed all tests to be D2009+ compatible

git-svn-id: trunk@26894 -

tests/test/cg/variants/ivarol116.pp

@@ -20,7 +20,6 @@ procedure test116(a: smallint); overload;
 procedure test116(a: widechar); overload;
   begin
     writeln('widechar called instead of smallint');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,13 @@ begin
   try
     v := y116;
     test116(v);
+    Writeln('Expected exception, did not get one');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      begin
+      Writeln('Caught exception as expected',E.ClassName);
+      end;
   end;
 end;
 

tests/test/cg/variants/ivarol126.pp

@@ -43,9 +43,11 @@ begin
   try
     v := y126;
     test126(v);
+    Writeln('No exception caught, exiting');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected',E.CLassName);
   end;
 end;
 

tests/test/cg/variants/ivarol135.pp

@@ -43,9 +43,11 @@ begin
   try
     v := y135;
     test135(v);
+    Writeln('Did not get exception');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol156.pp

@@ -20,7 +20,6 @@ procedure test156(a: single); overload;
 procedure test156(a: widechar); overload;
   begin
     writeln('widechar called instead of single');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y156;
     test156(v);
+    Writeln('Exception expected, but none raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol161.pp

@@ -20,7 +20,6 @@ procedure test161(a: double); overload;
 procedure test161(a: widechar); overload;
   begin
     writeln('widechar called instead of double');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y161;
     test161(v);
+    Writeln('Exception expected, but none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol165.pp

@@ -20,7 +20,6 @@ procedure test165(a: extended); overload;
 procedure test165(a: widechar); overload;
   begin
     writeln('widechar called instead of extended');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y165;
     test165(v);
+    Writeln('Exception expected, none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol170.pp

@@ -20,7 +20,6 @@ procedure test170(a: boolean); overload;
 procedure test170(a: widechar); overload;
   begin
     writeln('widechar called instead of boolean');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y170;
     test170(v);
+    Writeln('Exception expected, but none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected : ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol35.pp

@@ -20,7 +20,6 @@ procedure test35(a: comp35); overload;
 procedure test35(a: widechar); overload;
   begin
     writeln('widechar called instead of comp35');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y35;
     test35(v);
+    Writeln('Exception expected, none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol66.pp

@@ -20,7 +20,6 @@ procedure test66(a: currency); overload;
 procedure test66(a: widechar); overload;
   begin
     writeln('widechar called instead of currency');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y66;
     test66(v);
+    Writeln('Expected exception, none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol80.pp

@@ -20,7 +20,6 @@ procedure test80(a: longint); overload;
 procedure test80(a: widechar); overload;
   begin
     writeln('widechar called instead of longint');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y80;
     test80(v);
+    Writeln('Exception expected, but none was raised');
+    Halt(1)
   except
     on E : TObject do
-      halt(1);
+      Writeln('Exception caught, as expected: ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/ivarol93.pp

@@ -20,7 +20,6 @@ procedure test93(a: cardinal); overload;
 procedure test93(a: widechar); overload;
   begin
     writeln('widechar called instead of cardinal');
-    halt(1)
   end;
 
 var
@@ -43,9 +42,11 @@ begin
   try
     v := y93;
     test93(v);
+    Writeln('Expected exception, none was raised');
+    Halt(1);
   except
     on E : TObject do
-      halt(1);
+      Writeln('Caught exception, as expected : ',E.ClassName);
   end;
 end;
 

tests/test/cg/variants/tnofalvarol.pp

@@ -4,6 +4,7 @@
 {$define FPC_HAS_TYPE_EXTENDED}
 {$endif fpc}
 {$define bigfile}
+uses cwstring;
 
 {$i ivarol100.pp }
 {$i ivarol101.pp }