Skip to content

Commit 089d654

Browse files
MylesBorinsnodejs-github-bot
authored andcommitted
test: fix addons/dlopen-ping-pong for npm 7.0.1
This partially reverts c87641a as node-gyp no longer puts shared objects in an inconsistent location. PR-URL: #35667 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
1 parent 5b9593f commit 089d654

File tree

1 file changed

+2
-10
lines changed
  • test/addons/dlopen-ping-pong

1 file changed

+2
-10
lines changed

test/addons/dlopen-ping-pong/test.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@ const bindingPath = require.resolve(`./build/${common.buildType}/binding`);
1212
console.log('process.dlopen:', bindingPath);
1313
process.dlopen(module, bindingPath,
1414
os.constants.dlopen.RTLD_NOW | os.constants.dlopen.RTLD_GLOBAL);
15-
16-
let pingSOPath = `${path.dirname(bindingPath)}/lib.target/ping.so`;
17-
18-
if (common.isOSX) {
19-
pingSOPath = `${path.dirname(bindingPath)}/ping.so`;
20-
}
21-
22-
console.log('module.exports.load:', pingSOPath);
23-
module.exports.load(pingSOPath);
24-
15+
console.log('module.exports.load:', `${path.dirname(bindingPath)}/ping.so`);
16+
module.exports.load(`${path.dirname(bindingPath)}/ping.so`);
2517
assert.strictEqual(module.exports.ping(), 'pong');
2618

2719
// Check that after the addon is loaded with

0 commit comments

Comments
 (0)