Commit c61f909
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -90,7 +90,7 @@ to as `node::Environment`. Each `node::Environment` is associated with: | |||
| 90 | 90 | * A number of `v8::Context`s, but exactly one main `v8::Context`. | |
| 91 | 91 | * One `node::IsolateData` instance that contains information that could be | |
| 92 | 92 | shared by multiple `node::Environment`s that use the same `v8::Isolate`. | |
| 93 | - Currently, no testing if performed for this scenario. | ||
| 93 | + Currently, no testing is performed for this scenario. | ||
| 94 | 94 | ||
| 95 | 95 | In order to set up a `v8::Isolate`, an `v8::ArrayBuffer::Allocator` needs | |
| 96 | 96 | to be provided. One possible choice is the default Node.js allocator, which | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1249,6 +1249,7 @@ | |||
| 1249 | 1249 | ||
| 1250 | 1250 | 'include_dirs': [ | |
| 1251 | 1251 | 'src', | |
| 1252 | + 'tools', | ||
| 1252 | 1253 | 'tools/msvs/genfiles', | |
| 1253 | 1254 | 'deps/v8/include', | |
| 1254 | 1255 | 'deps/cares/include', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,9 +1,9 @@ | |||
| 1 | 1 | #ifdef NDEBUG | |
| 2 | 2 | #undef NDEBUG | |
| 3 | 3 | #endif | |
| 4 | - #include "node.h" | ||
| 5 | - #include "uv.h" | ||
| 6 | 4 | #include <assert.h> | |
| 5 | + #include "executable_wrapper.h" | ||
| 6 | + #include "node.h" | ||
| 7 | 7 | ||
| 8 | 8 | #include <algorithm> | |
| 9 | 9 | ||
@@ -27,8 +27,10 @@ static int RunNodeInstance(MultiIsolatePlatform* platform, | |||
| 27 | 27 | const std::vector<std::string>& args, | |
| 28 | 28 | const std::vector<std::string>& exec_args); | |
| 29 | 29 | ||
| 30 | - int main(int argc, char** argv) { | ||
| 31 | - argv = uv_setup_args(argc, argv); | ||
| 30 | + NODE_MAIN(int argc, node::argv_type raw_argv[]) { | ||
| 31 | + char** argv = nullptr; | ||
| 32 | + node::FixupMain(argc, raw_argv, &argv); | ||
| 33 | + | ||
| 32 | 34 | std::vector<std::string> args(argv, argv + argc); | |
| 33 | 35 | std::shared_ptr<node::InitializationResult> result = | |
| 34 | 36 | node::InitializeOncePerProcess( | |
@@ -106,7 +108,7 @@ int RunNodeInstance(MultiIsolatePlatform* platform, | |||
| 106 | 108 | } | |
| 107 | 109 | ||
| 108 | 110 | if (!snapshot_blob_path.empty() && !is_building_snapshot) { | |
| 109 | - FILE* fp = fopen(snapshot_blob_path.c_str(), "r"); | ||
| 111 | + FILE* fp = fopen(snapshot_blob_path.c_str(), "rb"); | ||
| 110 | 112 | assert(fp != nullptr); | |
| 111 | 113 | if (snapshot_as_file) { | |
| 112 | 114 | snapshot = node::EmbedderSnapshotData::FromFile(fp); | |
@@ -204,7 +206,7 @@ int RunNodeInstance(MultiIsolatePlatform* platform, | |||
| 204 | 206 | snapshot = setup->CreateSnapshot(); | |
| 205 | 207 | assert(snapshot); | |
| 206 | 208 | ||
| 207 | - FILE* fp = fopen(snapshot_blob_path.c_str(), "w"); | ||
| 209 | + FILE* fp = fopen(snapshot_blob_path.c_str(), "wb"); | ||
| 208 | 210 | assert(fp != nullptr); | |
| 209 | 211 | if (snapshot_as_file) { | |
| 210 | 212 | snapshot->ToFile(fp); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -333,6 +333,7 @@ if "%target%"=="Build" ( | |||
| 333 | 333 | if defined cctest set target="Build" | |
| 334 | 334 | ) | |
| 335 | 335 | if "%target%"=="node" if exist "%config%\cctest.exe" del "%config%\cctest.exe" | |
| 336 | + if "%target%"=="node" if exist "%config%\embedtest.exe" del "%config%\embedtest.exe" | ||
| 336 | 337 | if defined msbuild_args set "extra_msbuild_args=%extra_msbuild_args% %msbuild_args%" | |
| 337 | 338 | @rem Setup env variables to use multiprocessor build | |
| 338 | 339 | set UseMultiToolTask=True | |
@@ -675,6 +676,9 @@ if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" | |||
| 675 | 676 | echo running 'cctest %cctest_args%' | |
| 676 | 677 | "%config%\cctest" %cctest_args% | |
| 677 | 678 | if %errorlevel% neq 0 set exit_code=%errorlevel% | |
| 679 | + echo running '%node_exe% test\embedding\test-embedding.js' | ||
| 680 | + "%node_exe%" test\embedding\test-embedding.js | ||
| 681 | + if %errorlevel% neq 0 set exit_code=%errorlevel% | ||
| 678 | 682 | :run-test-py | |
| 679 | 683 | echo running 'python tools\test.py %test_args%' | |
| 680 | 684 | python tools\test.py %test_args% | |
0 commit comments