SERVER-18531 Integrate SpiderMonkey

Provides SpiderMonkey 38.0.1esr as a JS engine for mongo and mongod.

3 files changed, 5 insertions, 7 deletions

diff --git a/jstests/core/dbadmin.js b/jstests/core/dbadmin.js
index dbf195e056c..93e7dea308f 100644
--- a/jstests/core/dbadmin.js
+++ b/jstests/core/dbadmin.js
@@ -99,5 +99,5 @@ for (var i = 0; i < (versionArray.length - 1); i++) if (versionArray[i] >= 0) {
 assert.eq(serverStatus.version, latestStartUpLog.buildinfo.version, "Mongo version doesn't match that from ServerStatus");
 assert.eq(version, versionArrayCleaned.join('.'), "version doesn't match that from the versionArray");
 var jsEngine = latestStartUpLog.buildinfo.javascriptEngine;
-assert((jsEngine.startsWith("v8") || jsEngine == "none"));
+assert((jsEngine.startsWith("v8") || jsEngine == "none" || jsEngine.startsWith("mozjs")));
 assert.eq(isMaster.maxBsonObjectSize, latestStartUpLog.buildinfo.maxBsonObjectSize, "maxBsonObjectSize doesn't match one from ismaster");
diff --git a/jstests/core/hashtest1.js b/jstests/core/hashtest1.js
index 981a0c36877..d0307c2e59e 100644
--- a/jstests/core/hashtest1.js
+++ b/jstests/core/hashtest1.js
@@ -34,7 +34,8 @@ var nullHash = hash( null );
 assert(! friendlyEqual( falseHash , nullHash ) , "false and null should hash to different things");
 
 var dateHash = hash( new Date() );
-sleep(1);
+// Sleep so we get a new date. Sleeping for 1 sometimes returns the same date, so 2
+sleep(2);
 var isodateHash = hash( ISODate() );
 assert(! friendlyEqual( dateHash, isodateHash) , "different dates should hash to different things");
 
@@ -75,4 +76,4 @@ assert.eq( nanHash , zeroHash , "NaN and Zero should hash to the same thing");
 
 
 //should also test that CodeWScope hashes correctly
-//but waiting for SERVER-3391 (CodeWScope support in shell)
\ No newline at end of file
+//but waiting for SERVER-3391 (CodeWScope support in shell)
diff --git a/jstests/core/where5.js b/jstests/core/where5.js
index d7140cd21f6..1c0ea8d0076 100644
--- a/jstests/core/where5.js
+++ b/jstests/core/where5.js
@@ -1,4 +1,4 @@
-// Tests toString() on _v8_function in object constructor.
+// Tests toString() in object constructor.
 // Verifies that native functions do not expose the _native_function and _native_data properties.
 
 var t = db.where5;
@@ -14,9 +14,6 @@ function printIdConstructor(doc) {
         doc = this;
     }
 
-    // This used to crash.
-    doc._id.constructor._v8_function.toString();
-
     // Verify that function and data fields are hidden.
     assert(!('_native_function' in sleep));
     assert(!('_native_data' in sleep));