inputoutputstream fd fix
[nestedvm.git] / src / tests / CallTest.java
index 77fd217..95184ce 100644 (file)
@@ -26,7 +26,7 @@ public class CallTest {
                         case 1: return rt.strdup("OS: " + System.getProperty("os.name"));
                         case 2: return rt.strdup(System.getProperty("os.version"));
                         case 3: return rt.strdup(new Date().toString());
-                        case 4: return rt.addFD(new Runtime.OutputStreamFD(new CustomOS()));
+                        case 4: return rt.addFD(new Runtime.InputOutputStreamFD(null,new CustomOS()));
                         case 5:
                             System.out.println("In callJava() in Java"); 
                             try { rt.call("backinmips"); } catch(Runtime.CallException e) { }
@@ -43,12 +43,13 @@ public class CallTest {
         
         System.out.println("== Start of CallTest ==");
         System.out.println("Back in java... calling callme()");
-        int ret = rt.call("callme",a1,a2,a3,a4,a5,a6);
+        int ret = rt.call("callme",new int[]{a1,a2,a3,a4,a5,a6});
         System.out.println("callme returned: " + ret);
         
         int addr = rt.strdup("Hello, World from java");
         rt.call("echo",addr,4);
         rt.free(addr);
+        rt.call("echo",new Object[]{"Hello, World, from the Object[] call method",new Integer(2)});
         System.out.println("== End of CallTest ==");
         
         rt.execute();