Skip to content

Commit 0041dd3

Browse files
authored
test: fix lldb 3.9+ version separator for linux
PR-URL: #160 Fixes: #159 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 42b0a84 commit 0041dd3

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

test/common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ else
3333
exports.llnodePath = path.join(exports.projectDir, pluginName);
3434
exports.saveCoreTimeout = 180 * 1000;
3535
exports.loadCoreTimeout = 20 * 1000;
36+
exports.versionMark = /^lldb-|^lldb version/;
3637

3738
function SessionOutput(session, stream, timeout) {
3839
EventEmitter.call(this);

test/scan-test.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
const tape = require('tape');
44
const common = require('./common');
5+
const versionMark = common.versionMark;
56

67
tape('v8 findrefs and friends', (t) => {
78
t.timeoutAfter(common.saveCoreTimeout);
@@ -28,7 +29,7 @@ function saveCoreAndTest(t) {
2829
sess.send('version');
2930
});
3031

31-
sess.wait(/lldb-/, (err) => {
32+
sess.wait(versionMark, (err) => {
3233
t.error(err);
3334
t.ok(true, 'Saved core');
3435
sess.send('target delete 0');
@@ -63,14 +64,14 @@ function test(executable, core, t) {
6364
}
6465
});
6566

66-
sess.wait(/lldb-/, (err) => {
67+
sess.wait(versionMark, (err) => {
6768
t.error(err);
6869
sess.send('v8 findjsobjects');
6970
// Just a separator
7071
sess.send('version');
7172
});
7273

73-
sess.linesUntil(/lldb-/, (err, lines) => {
74+
sess.linesUntil(versionMark, (err, lines) => {
7475
t.error(err);
7576
t.ok(/\d+ Zlib/.test(lines.join('\n')), 'Zlib should be in findjsobjects');
7677

@@ -79,7 +80,7 @@ function test(executable, core, t) {
7980
sess.send('version');
8081
});
8182

82-
sess.linesUntil(/lldb-/, (err, lines) => {
83+
sess.linesUntil(versionMark, (err, lines) => {
8384
t.error(err);
8485
// Find refs to every Zlib instance
8586
let found = false;
@@ -97,7 +98,7 @@ function test(executable, core, t) {
9798
sess.send('version');
9899
});
99100

100-
sess.linesUntil(/lldb-/, (err, lines) => {
101+
sess.linesUntil(versionMark, (err, lines) => {
101102
t.error(err);
102103

103104
// `class Deflate extends Zlib` makes instances show up as

0 commit comments

Comments
 (0)