Browse Source

+ tval5, also already works

git-svn-id: branches/jvmbackend@18880 -
Jonas Maebe 14 years ago
parent
commit
1e329866b4
3 changed files with 13 additions and 3 deletions
  1. 4 0
      tests/test/jvm/testall.bat
  2. 2 0
      tests/test/jvm/testall.sh
  3. 7 3
      tests/test/jvm/tval5.pp

+ 4 - 0
tests/test/jvm/testall.bat

@@ -200,4 +200,8 @@ ppcjvm -O2 -g -B tval
 if %errorlevel% neq 0 exit /b %errorlevel%
 if %errorlevel% neq 0 exit /b %errorlevel%
 java -Dfile.encoding=UTF-8 -cp ..\..\..\rtl\units\jvm-java;. tval
 java -Dfile.encoding=UTF-8 -cp ..\..\..\rtl\units\jvm-java;. tval
 if %errorlevel% neq 0 exit /b %errorlevel%
 if %errorlevel% neq 0 exit /b %errorlevel%
+ppcjvm -O2 -g -B tval5
+if %errorlevel% neq 0 exit /b %errorlevel%
+java -Dfile.encoding=UTF-8 -cp ..\..\..\rtl\units\jvm-java;. tval5
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 

+ 2 - 0
tests/test/jvm/testall.sh

@@ -110,3 +110,5 @@ $PPC -O2 -g tstrreal2
 java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstrreal2
 java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstrreal2
 $PPC -O2 -g -B tval
 $PPC -O2 -g -B tval
 java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tval
 java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tval
+$PPC -O2 -g -B tval5
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tval5

+ 7 - 3
tests/test/jvm/tval5.pp

@@ -1,7 +1,11 @@
+program tval5;
+
 {$mode objfpc}
 {$mode objfpc}
 
 
+{$ifndef cpujvm}
 uses
 uses
   sysutils;
   sysutils;
+{$endif}
 
 
 procedure testcard;
 procedure testcard;
 const
 const
@@ -51,7 +55,7 @@ begin
 {$endif cpu64}
 {$endif cpu64}
             val(s,c,l);
             val(s,c,l);
 {$ifdef cpu64}
 {$ifdef cpu64}
-          except on e : exception do
+          except on e : jlthrowable do
             caught:=true;
             caught:=true;
           end;
           end;
           if not caught then
           if not caught then
@@ -91,7 +95,7 @@ begin
 {$endif cpu64}
 {$endif cpu64}
           val(s,c,l);
           val(s,c,l);
 {$ifdef cpu64}
 {$ifdef cpu64}
-      except on e : exception do
+      except on e : jlthrowable do
         caught:=true;
         caught:=true;
       end;
       end;
       if not caught then
       if not caught then
@@ -116,7 +120,7 @@ begin
 {$endif cpu64}
 {$endif cpu64}
             val(s,c,l);
             val(s,c,l);
 {$ifdef cpu64}
 {$ifdef cpu64}
-          except on e : exception do
+          except on e : jlthrowable do
             caught:=true;
             caught:=true;
           end;
           end;
           if not caught then
           if not caught then