Skip to content

test: remove hardwired references to 'iojs' #1882

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

Closed
rvagg wants to merge 1 commit into from
Closed

test: remove hardwired references to 'iojs' #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions test/debugger/test-debugger-remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var expected = [];
var scriptToDebug = common.fixturesDir + '/empty.js';

function fail() {
assert(0); // `iojs --debug-brk script.js` should not quit
assert(0); // `--debug-brk script.js` should not quit
}

// running with debug agent
Expand Down Expand Up @@ -37,7 +37,7 @@ interfacer.on('line', function(line) {
assert.ok(expected == line, 'Got unexpected line: ' + line);
});

// give iojs time to start up the debugger
// allow time to start up the debugger
setTimeout(function() {
child.removeListener('exit', fail);
child.kill();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-process-argv-0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ console.error('argv=%j', process.argv);
console.error('exec=%j', process.execPath);

if (process.argv[2] !== 'child') {
var child = spawn('./iojs', [__filename, 'child'], {
var child = spawn(process.execPath, [__filename, 'child'], {
cwd: path.dirname(process.execPath)
});

Expand Down
4 changes: 3 additions & 1 deletion test/sequential/test-setproctitle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ if ('linux freebsd darwin'.indexOf(process.platform) === -1) {
var common = require('../common');
var assert = require('assert');
var exec = require('child_process').exec;
var path = require('path');

// The title shouldn't be too long; libuv's uv_set_process_title() out of
// security considerations no longer overwrites envp, only argv, so the
Expand All @@ -25,7 +26,8 @@ exec('ps -p ' + process.pid + ' -o args=', function(error, stdout, stderr) {
assert.equal(stderr, '');

// freebsd always add ' (procname)' to the process title
if (process.platform === 'freebsd') title += ' (iojs)';
if (process.platform === 'freebsd')
title += ` (${path.basename(process.execPath)})`;
Copy link
Contributor

@silverwind silverwind Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will append .exe on Windows. I say just change it to node or do something like this.

Copy link
Member

@targos targos Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

process.platform can't be 'freebsd' on Windows

Copy link
Contributor

@silverwind silverwind Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right 😅


// omitting trailing whitespace and \n
assert.equal(stdout.replace(/\s+$/, ''), title);
Expand Down