test: fix test suite to work with npm 7

PR-URL: #35474 Reviewed-By: Ruy Adorno <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Ben Coe <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
nodejs · Oct 7, 2020 · c87641a · c87641a
1 parent 2e54524
commit c87641a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -1384,7 +1384,7 @@ CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
 
 # Related CI job: node-test-linter
 lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs
-	@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
+	@if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" benchmark deps doc lib src test tools ) \
 		&& ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
 		exit 0 ; \
 	else \

diff --git a/test/addons/dlopen-ping-pong/test.js b/test/addons/dlopen-ping-pong/test.js
@@ -12,8 +12,16 @@ const bindingPath = require.resolve(`./build/${common.buildType}/binding`);
 console.log('process.dlopen:', bindingPath);
 process.dlopen(module, bindingPath,
                os.constants.dlopen.RTLD_NOW | os.constants.dlopen.RTLD_GLOBAL);
-console.log('module.exports.load:', `${path.dirname(bindingPath)}/ping.so`);
-module.exports.load(`${path.dirname(bindingPath)}/ping.so`);
+
+let pingSOPath = `${path.dirname(bindingPath)}/lib.target/ping.so`;
+
+if (common.isOSX) {
+  pingSOPath = `${path.dirname(bindingPath)}/ping.so`;
+}
+
+console.log('module.exports.load:', pingSOPath);
+module.exports.load(pingSOPath);
+
 assert.strictEqual(module.exports.ping(), 'pong');
 
 // Check that after the addon is loaded with

diff --git a/test/parallel/test-macos-signed-deps.js b/test/parallel/test-macos-signed-deps.js
diff --git a/test/parallel/test-npm-version.js b/test/parallel/test-npm-version.js
@@ -14,5 +14,5 @@ const npmPathPackageJson = path.resolve(
 );
 
 const pkg = require(npmPathPackageJson);
-assert(pkg.version.match(/^\d+\.\d+\.\d+$/),
+assert(pkg.version.match(/^\d+\.\d+\.\d+-rc\.\d+$/),
        `unexpected version number: ${pkg.version}`);