test: disable test case for node-chakracore and fix a couple lint issues

nodejs · Dec 7, 2017 · fb3330b · fb3330b
1 parent 40a2c90
commit fb3330b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -127,7 +127,7 @@ bool s_doTTRecord = false;
 bool s_doTTReplay = false;
 bool s_doTTDebug = false;
 size_t s_ttoptReplayUriLength = 0;
-const char* s_ttoptReplayUri = NULL;
+const char* s_ttoptReplayUri = nullptr;
 uint32_t s_ttdSnapInterval = 2000;
 uint32_t s_ttdSnapHistoryLength = 2;
 uint64_t s_ttdStartupMode = 0x1;

diff --git a/src/node_api_jsrt.cc b/src/node_api_jsrt.cc
@@ -2069,7 +2069,7 @@ napi_status napi_new_instance(napi_env env,
 napi_status napi_make_external(napi_env env, napi_value v, napi_value* result) {
   CHECK_ARG(result);
   JsValueRef externalObj;
-  CHECK_JSRT(JsCreateExternalObject(NULL, NULL, &externalObj));
+  CHECK_JSRT(JsCreateExternalObject(nullptr, nullptr, &externalObj));
   CHECK_JSRT(JsSetPrototype(externalObj, reinterpret_cast<JsValueRef>(v)));
   *result = reinterpret_cast<napi_value>(externalObj);
   return napi_ok;

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
@@ -136,6 +136,9 @@ test-windows-failed-heap-allocation : SKIP
 # support is not implemented yet.
 test-preload : SKIP
 
+# This test depends on V8 error API for stack traces which is not implemented
+# in Node-ChakraCore
+test-common-must-not-call : SKIP
 
 [$jsEngine==chakracore && $arch==x64]
 # These tests are failing for Node-Chakracore and should eventually be fixed

diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
@@ -956,7 +956,8 @@ if (!common.isChakraEngine) {
   {
     const map = new Map([['foo', 'bar']]);
     assert.strictEqual(util.inspect(map.keys()), '[Map Iterator] { \'foo\' }');
-    assert.strictEqual(util.inspect(map.values()), '[Map Iterator] { \'bar\' }');
+    assert.strictEqual(util.inspect(map.values()),
+                       '[Map Iterator] { \'bar\' }');
     assert.strictEqual(util.inspect(map.entries()),
                        '[Map Iterator] { [ \'foo\', \'bar\' ] }');
     // make sure the iterator doesn't get consumed