test: simplify test skipping

* Make common.skip() exit.

  Also add common.printSkipMessage() for partial skips.

* Don't make needless things before skip

PR-URL: https://github.com/nodejs/node/pull/14021
Fixes: https://github.com/nodejs/node/issues/14016
Reviewed-By: Refael Ackermann <refack@gmail.com>

3 files changed, 10 insertions, 22 deletions

diff --git a/test/tick-processor/test-tick-processor-builtin.js b/test/tick-processor/test-tick-processor-builtin.js
index afe08bdb0b..0fb839f8d1 100644
--- a/test/tick-processor/test-tick-processor-builtin.js
+++ b/test/tick-processor/test-tick-processor-builtin.js
@@ -1,19 +1,15 @@
 'use strict';
 const common = require('../common');
 
+if (!common.enoughTestCpu)
+  common.skip('test is CPU-intensive');
+
 if (common.isWindows ||
     common.isSunOS ||
     common.isAix ||
     common.isLinuxPPCBE ||
-    common.isFreeBSD) {
+    common.isFreeBSD)
   common.skip('C++ symbols are not mapped for this os.');
-  return;
-}
-
-if (!common.enoughTestCpu) {
-  common.skip('test is CPU-intensive');
-  return;
-}
 
 const base = require('./tick-processor-base.js');
 
diff --git a/test/tick-processor/test-tick-processor-cpp-core.js b/test/tick-processor/test-tick-processor-cpp-core.js
index 72eb25e91c..dc1aed41a7 100644
--- a/test/tick-processor/test-tick-processor-cpp-core.js
+++ b/test/tick-processor/test-tick-processor-cpp-core.js
@@ -1,19 +1,15 @@
 'use strict';
 const common = require('../common');
 
+if (!common.enoughTestCpu)
+  common.skip('test is CPU-intensive');
+
 if (common.isWindows ||
     common.isSunOS ||
     common.isAix ||
     common.isLinuxPPCBE ||
-    common.isFreeBSD) {
+    common.isFreeBSD)
   common.skip('C++ symbols are not mapped for this os.');
-  return;
-}
-
-if (!common.enoughTestCpu) {
-  common.skip('test is CPU-intensive');
-  return;
-}
 
 const base = require('./tick-processor-base.js');
 
diff --git a/test/tick-processor/test-tick-processor-unknown.js b/test/tick-processor/test-tick-processor-unknown.js
index ab3d110ccf..c0f5f332b2 100644
--- a/test/tick-processor/test-tick-processor-unknown.js
+++ b/test/tick-processor/test-tick-processor-unknown.js
@@ -6,15 +6,11 @@ const common = require('../common');
 // the full 64 bits and the result is that it does not process the
 // addresses correctly and runs out of memory
 // Disabling until we get a fix upstreamed into V8
-if (common.isAix) {
+if (common.isAix)
   common.skip('AIX address range too big for scripts.');
-  return;
-}
 
-if (!common.enoughTestCpu) {
+if (!common.enoughTestCpu)
   common.skip('test is CPU-intensive');
-  return;
-}
 
 const base = require('./tick-processor-base.js');