Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix npm link usage on Node.js 6 #815

Merged
merged 3 commits into from
May 8, 2016
Merged

Fix npm link usage on Node.js 6 #815

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db715d
temp fix for npm link
jamestalmage May 7, 2016
7ea196a
Make it work for AVA's test suite.
jamestalmage May 7, 2016
8ffb4c8
Add some better comments that discuss when the change can be reverted.
jamestalmage May 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions lib/fork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,35 @@ module.exports = function (file, opts) {
} : false
}, opts);

var ps = childProcess.fork(path.join(__dirname, 'test-worker.js'), [JSON.stringify(opts)], {
cwd: path.dirname(file),
silent: true,
// Workaround for breakage caused by https://github.com/nodejs/node/pull/5950
// Those changes will be reverted in https://github.com/nodejs/node/pull/6537

// Revert #815 when these changes land in Node.js
var execArgv = process.execArgv;
var cwd = path.dirname(file);

// This whole if statement is copied straight out of Nodes `child_process`
if (process._eval != null) { // eslint-disable-line
var index = execArgv.lastIndexOf(process._eval);
if (index > 0) {
// Remove the -e switch to avoid fork bombing ourselves.
execArgv = execArgv.slice();
execArgv.splice(index - 1, 2);
}
}

var testWorkerPath = path.join(__dirname, 'test-worker.js');

var args = execArgv.concat([
'-e',
'require(' + JSON.stringify(testWorkerPath) + ')',
testWorkerPath,
JSON.stringify(opts)
]);

var ps = childProcess.spawn(process.execPath, args, {
cwd: cwd,
stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
env: env
});

Expand Down