Merge branch 'master' of https://github.com/mozilla/pluotsorbet into merge_master_into_intex

Makefile

@@ -35,7 +35,7 @@ endif
 
 NAME ?= PluotSorbet
 MIDLET_NAME ?= midlet
-DESCRIPTION ?= j2me interpreter for firefox os
+DESCRIPTION ?= a J2ME-compatible virtual machine written in JavaScript
 ORIGIN ?= app://pluotsorbet.mozilla.org
 VERSION ?= $(shell date +%s)
 
@@ -197,7 +197,7 @@ CLOSURE_COMPILER_VERSION=j2me.js-v20150428
 OLD_CLOSURE_COMPILER_VERSION := $(shell [ -f build_tools/.closure_compiler_version ] && cat build_tools/.closure_compiler_version)
 $(shell [ "$(CLOSURE_COMPILER_VERSION)" != "$(OLD_CLOSURE_COMPILER_VERSION)" ] && echo $(CLOSURE_COMPILER_VERSION) > build_tools/.closure_compiler_version)
 
-SPIDERMONKEY_VERSION=37.0b7
+SPIDERMONKEY_VERSION=38.1.0esr
 OLD_SPIDERMONKEY_VERSION := $(shell [ -f build_tools/.spidermonkey_version ] && cat build_tools/.spidermonkey_version)
 $(shell [ "$(SPIDERMONKEY_VERSION)" != "$(OLD_SPIDERMONKEY_VERSION)" ] && echo $(SPIDERMONKEY_VERSION) > build_tools/.spidermonkey_version)
 

README.md

@@ -1,6 +1,6 @@
 # PluotSorbet [![Build Status](https://travis-ci.org/mozilla/pluotsorbet.svg)](https://travis-ci.org/mozilla/pluotsorbet)
 
-PluotSorbet implements a Java-compatible virtual machine and J2ME-compatible platform in JavaScript<sup>[[1]](#user-content-JavaScript)</sup>. The goal of PluotSorbet is to run MIDlets in web apps without a native plugin.
+PluotSorbet is a J2ME-compatible virtual machine written in JavaScript<sup>[[1]](#user-content-JavaScript)</sup>. The goal of PluotSorbet is to run MIDlets in web apps without a native plugin.
 
 The current goals of PluotSorbet are:
 

tests/gnu/testlet/vm/TestIsolate.java

@@ -5,7 +5,7 @@ import com.sun.cldc.isolate.*;
 import gnu.testlet.vm.IsolatedClass;
 
 public class TestIsolate implements Testlet {
-    public int getExpectedPass() { return 10; }
+    public int getExpectedPass() { return 4; }
     public int getExpectedFail() { return 0; }
     public int getExpectedKnownFail() { return 0; }
     public void test(TestHarness th) {
@@ -16,23 +16,11 @@ public class TestIsolate implements Testlet {
         th.check(c.val, 2);
         th.check(IsolatedClass.val, 2);
 
-        Isolate[] isolates = Isolate.getIsolates();
-        th.check(isolates.length, 1);
-        th.check(isolates[0].id(), Isolate.currentIsolate().id());
-
         try {
             Isolate iso = new Isolate("gnu.testlet.vm.IsolatedClass", new String[] { "5" });
             iso.start();
-
-            isolates = Isolate.getIsolates();
-            th.check(isolates.length, 2);
-            th.check(isolates[0].id(), Isolate.currentIsolate().id());
-            th.check(isolates[1].id(), iso.id());
-
             iso.waitForExit();
             th.check(IsolatedClass.val, 2);
-
-            th.check(iso.isTerminated());
         } catch(Exception e) {
             th.fail("Unexpected exception: " + e.getMessage());
         }