test: try to fix linux

nodejs · Nov 28, 2017 · be87066 · be87066
1 parent 1a7b14d
commit be87066
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/test/common.js b/test/common.js
@@ -8,7 +8,7 @@ const spawn = require('child_process').spawn;
 const EventEmitter = require('events').EventEmitter;
 
 exports.fixturesDir = path.join(__dirname, 'fixtures');
-exports.buildDir = path.join(__dirname, '..', 'out', 'Release');
+exports.projectDir = path.join(__dirname, '..');
 
 exports.core = path.join(os.tmpdir(), 'core');
 
@@ -25,9 +25,9 @@ if (process.platform === 'darwin')
 else if (process.platform === 'windows')
  pluginName = 'llnode.dll';
 else
- pluginName = path.join('lib.target', 'llnode.so');
+ pluginName = 'llnode.so';
 
-exports.llnodePath = path.join(exports.buildDir, pluginName);
+exports.llnodePath = path.join(exports.projectDir, pluginName);
 exports.saveCoreTimeout = 180 * 1000;
 exports.loadCoreTimeout = 20 * 1000;
 
@@ -210,13 +210,17 @@ Session.prototype.waitCoreLoad = function waitCoreLoad(callback) {
 };
 
 Session.prototype.kill = function kill() {
- this.lldb.kill();
- this.lldb = null;
+ // if a 'quit' has been sent to lldb, killing it could result in ECONNRESET
+ if (this.lldb.channel) {
+ debug('kill lldb');
+ this.lldb.kill();
+ this.lldb = null;
+ }
 };
 
 Session.prototype.quit = function quit() {
  if (this.needToKill) {
- this.send('kill');
+ this.send('kill'); // kill the process launched in lldb
  }
  this.send('quit');
 };

diff --git a/test/usage-test.js b/test/usage-test.js
@@ -16,28 +16,26 @@ tape('usage messages', (t) => {
  });
 
  sess.stderr.linesUntil(/USAGE/, (lines) => {
- t.ok(/^error: USAGE: v8 print expr$/.test(removeBlankLines(lines)[0]),
-   'print usage message');
+ const re = /^error: USAGE: v8 print expr$/;
+ t.ok(lines.some(line => re.test(line.trim())), 'print usage message');
  sess.send('v8 source list');
  });
 
  sess.stderr.linesUntil(/USAGE/, (lines) => {
- t.ok(/^error: USAGE: v8 source list$/.test(removeBlankLines(lines)[0]),
-   'list usage message');
+ const re = /^error: USAGE: v8 source list$/;
+ t.ok(lines.some(line => re.test(line.trim())), 'list usage message');
  sess.send('v8 findjsinstances');
  });
 
  sess.stderr.linesUntil(/USAGE/, (lines) => {
  const re = /^error: USAGE: v8 findjsinstances \[flags\] instance_name$/;
-
- t.ok(re.test(removeBlankLines(lines)[0]),
- 'findjsinstances usage message');
+ t.ok(lines.some(line => re.test(line.trim())), 'findjsinstances usage message');
  sess.send('v8 findrefs');
  });
 
  sess.stderr.linesUntil(/USAGE/, (lines) => {
- t.ok(/^error: USAGE: v8 findrefs expr$/.test(removeBlankLines(lines)[0]),
-   'findrefs usage message');
+ const re = /^error: USAGE: v8 findrefs expr$/;
+ t.ok(lines.some(line => re.test(line.trim())), 'findrefs usage message');
  sess.quit();
  t.end();
  });