From a361d492859b77107fe311c43c88c1977d880a5a Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Thu, 23 Mar 2017 14:12:34 -0700 Subject: [PATCH] chakrashim,test: Revert previous changes for chakracore Reverted https://github.com/nodejs/node-chakracore/commit/374a1d81bb4b5eb3dc43795955d36a9d0103c295 because https://github.com/nodejs/node/pull/11854 is present in upstream. Updated v8-version PR-URL: #198 Signed-off-by: Hitesh Kanwathirtha --- deps/chakrashim/include/v8-version.h | 2 +- test/parallel/test-util-format.js | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/deps/chakrashim/include/v8-version.h b/deps/chakrashim/include/v8-version.h index ff9450b471d..0ba39af250f 100644 --- a/deps/chakrashim/include/v8-version.h +++ b/deps/chakrashim/include/v8-version.h @@ -34,7 +34,7 @@ #define V8_MAJOR_VERSION 5 #define V8_MINOR_VERSION 6 #define V8_BUILD_NUMBER 326 -#define V8_PATCH_LEVEL 56 +#define V8_PATCH_LEVEL 57 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/test/parallel/test-util-format.js b/test/parallel/test-util-format.js index e64eb1b25cd..a57a8094ac0 100644 --- a/test/parallel/test-util-format.js +++ b/test/parallel/test-util-format.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const util = require('util'); const symbol = Symbol('foo'); @@ -83,18 +83,7 @@ assert.strictEqual(util.format('o: %j, a: %j'), 'o: %j, a: %j'); { const o = {}; o.o = o; - if (!common.isChakraEngine) { - assert.strictEqual(util.format('%j', o), '[Circular]'); - } else { - assert.throws(() => { util.format('%j', o); }, function(err) { - if (err instanceof TypeError && - err.message === 'Circular reference in value argument not ' + - 'supported') { - return true; - } - return false; - }); - } + assert.strictEqual(util.format('%j', o), '[Circular]'); } {