Skip to content

Commit

Permalink
chakrashim,test: Revert previous changes for chakracore
Browse files Browse the repository at this point in the history
Reverted nodejs@374a1d8 because
nodejs/node#11854 is present in upstream.

Updated v8-version
  • Loading branch information
kunalspathak committed Mar 23, 2017
1 parent dca6f4b commit e5571b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion deps/chakrashim/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
15 changes: 2 additions & 13 deletions test/parallel/test-util-format.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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]');
}

{
Expand Down

0 comments on commit e5571b7

Please sign in to comment.