test: fix test-abort-backtrace in shared lib build

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 <[email protected]> PR-URL: #19213 Refs: #18535 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Mar 20, 2018 · f0c8f69 · f0c8f69
1 parent 530b8a4
commit f0c8f69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/test/abort/test-abort-backtrace.js b/test/abort/test-abort-backtrace.js
@@ -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}`);
       }
     }

diff --git a/test/common/shared-lib-util.js b/test/common/shared-lib-util.js
@@ -29,7 +29,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');
@@ -42,3 +42,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;
+};