Skip to content

Commit

Permalink
test: fix test-abort-backtrace in shared lib build
Browse files Browse the repository at this point in the history
When using shared lib build, the binary path in the stack frames points
to shared lib. Change the checking criteria in the test case to match
that.

Refs: #18535

Signed-off-by: Yihong Wang <yh.wang@ibm.com>

Backport-PR-URL: #22380
PR-URL: #19213
Refs: #18535
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
yhwang authored and MylesBorins committed Sep 6, 2018
1 parent a0fd0b6 commit 9c781f0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion test/abort/test-abort-backtrace.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ if (process.argv[2] === 'child') {
}

if (!common.isWindows) {
if (!frames.some((frame) => frame.includes(`[${process.execPath}]`))) {
const { getBinaryPath } = require('../common/shared-lib-util');
if (!frames.some((frame) => frame.includes(`[${getBinaryPath()}]`))) {
assert.fail(`Some frames should include the binary name:\n${stderr}`);
}
}
Expand Down
8 changes: 7 additions & 1 deletion test/common/shared-lib-util.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports.addLibraryPath = function(env) {
path.dirname(process.execPath);
};

// Get the full path of shared lib
// Get the full path of shared lib.
exports.getSharedLibPath = function() {
if (common.isWindows) {
return path.join(path.dirname(process.execPath), 'node.dll');
Expand All @@ -41,3 +41,9 @@ exports.getSharedLibPath = function() {
`libnode.${process.config.variables.shlib_suffix}`);
}
};

// Get the binary path of stack frames.
exports.getBinaryPath = function() {
return process.config.variables.node_shared ?
exports.getSharedLibPath() : process.execPath;
};

0 comments on commit 9c781f0

Please sign in to comment.