Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
src,test: disable per_context.js shim
Browse files Browse the repository at this point in the history
The `Intl` usage in the the shim is causing issues in ChakraCore on
Linux and Mac. Since we don't necessarily need the `Atomics.notify`
shim code either the simplest solution is to remove the shim
completely for ChakraCore.

Refs: #565
Refs: #567
PR-URL: #566
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
  • Loading branch information
kfarnung committed Jul 10, 2018
1 parent f737a28 commit 4236937
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3638,6 +3638,7 @@ Local<Context> NewContext(Isolate* isolate,
context->SetEmbedderData(
ContextEmbedderIndex::kAllowWasmCodeGeneration, True(isolate));

#ifndef NODE_ENGINE_CHAKRACORE
{
// Run lib/internal/per_context.js
Context::Scope context_scope(context);
Expand All @@ -3648,6 +3649,7 @@ Local<Context> NewContext(Isolate* isolate,
&per_context_src).ToLocalChecked();
s->Run(context).ToLocalChecked();
}
#endif

return context;
}
Expand Down
4 changes: 4 additions & 0 deletions test/parallel/parallel.status
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ test-vm-createcacheddata : SKIP
# Issue: https://github.com/nodejs/node-chakracore/issues/563
test-zlib-unused-weak : SKIP

# Removed the wake->notify shim code
# Issue: https://github.com/nodejs/node-chakracore/issues/565
test-atomics-notify : SKIP

[$jsEngine==chakracore && $arch==x64]
# These tests are failing for Node-Chakracore and should eventually be fixed
test-buffer-includes : SKIP
Expand Down

0 comments on commit 4236937

Please sign in to comment.