Browse Source

test: remove hardwired references to 'iojs'

PR-URL: https://github.com/nodejs/io.js/pull/1882
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Reiss <me@silverwind.io>
v2.3.1-release
Rod Vagg 10 years ago
committed by Roman Reiss
parent
commit
f78c722df5
  1. 4
      test/debugger/test-debugger-remote.js
  2. 2
      test/parallel/test-process-argv-0.js
  3. 4
      test/sequential/test-setproctitle.js

4
test/debugger/test-debugger-remote.js

@ -9,7 +9,7 @@ var expected = [];
var scriptToDebug = common.fixturesDir + '/empty.js'; var scriptToDebug = common.fixturesDir + '/empty.js';
function fail() { 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 // running with debug agent
@ -37,7 +37,7 @@ interfacer.on('line', function(line) {
assert.ok(expected == line, 'Got unexpected line: ' + 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() { setTimeout(function() {
child.removeListener('exit', fail); child.removeListener('exit', fail);
child.kill(); child.kill();

2
test/parallel/test-process-argv-0.js

@ -9,7 +9,7 @@ console.error('argv=%j', process.argv);
console.error('exec=%j', process.execPath); console.error('exec=%j', process.execPath);
if (process.argv[2] !== 'child') { if (process.argv[2] !== 'child') {
var child = spawn('./iojs', [__filename, 'child'], { var child = spawn(process.execPath, [__filename, 'child'], {
cwd: path.dirname(process.execPath) cwd: path.dirname(process.execPath)
}); });

4
test/sequential/test-setproctitle.js

@ -10,6 +10,7 @@ if ('linux freebsd darwin'.indexOf(process.platform) === -1) {
var common = require('../common'); var common = require('../common');
var assert = require('assert'); var assert = require('assert');
var exec = require('child_process').exec; 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 // 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 // security considerations no longer overwrites envp, only argv, so the
@ -25,7 +26,8 @@ exec('ps -p ' + process.pid + ' -o args=', function(error, stdout, stderr) {
assert.equal(stderr, ''); assert.equal(stderr, '');
// freebsd always add ' (procname)' to the process title // freebsd always add ' (procname)' to the process title
if (process.platform === 'freebsd') title += ' (iojs)'; if (process.platform === 'freebsd')
title += ` (${path.basename(process.execPath)})`;
// omitting trailing whitespace and \n // omitting trailing whitespace and \n
assert.equal(stdout.replace(/\s+$/, ''), title); assert.equal(stdout.replace(/\s+$/, ''), title);

Loading…
Cancel
Save