test: make common.skip() exit

Also add common.printSkipMessage() for partial skips. Fixes: #14016
nodejs · vsemozhetbyt · Jun 30, 2017 · Jul 1, 2017 · Jul 4, 2017 · ab91eb8aadecc7af5c2ec61b3a4e96a4f0acb3ec
commit ab91eb8aadecc7af5c2ec61b3a4e96a4f0acb3ec
diff --git a/test/abort/test-abort-backtrace.js b/test/abort/test-abort-backtrace.js
@@ -3,10 +3,8 @@ const common = require('../common');
 const assert = require('assert');
 const cp = require('child_process');
 
-if (common.isWindows) {
+if (common.isWindows)
   common.skip('Backtraces unimplemented on Windows.');
-  return;
-}
 
 if (process.argv[2] === 'child') {
   process.abort();

diff --git a/test/addons/load-long-path/test.js b/test/addons/load-long-path/test.js
@@ -4,10 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 
-if (common.isWOW64) {
+if (common.isWOW64)
   common.skip('doesn\'t work on WOW64');
-  return;
-}
 
 common.refreshTmpDir();
 

diff --git a/test/addons/openssl-binding/test.js b/test/addons/openssl-binding/test.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const common = require('../../common');
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  process.exit(0);
-}
+
 const assert = require('assert');
 const binding = require(`./build/${common.buildType}/binding`);
 const bytes = new Uint8Array(1024);

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js
@@ -9,10 +9,8 @@ const assert = require('assert');
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 let buf;
 try {
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 const maxString = buf.toString('latin1');
 assert.strictEqual(maxString.length, kStringMaxLength);
diff --git a/...addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js b/...addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString('ascii');

diff --git a/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js b/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString('base64');

diff --git a/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js b/...ddons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString('latin1');

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString('hex');

diff --git a/.../addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js b/.../addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString();

diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 const maxString = buf.toString('utf16le');
 assert.strictEqual(maxString.length, (kStringMaxLength + 2) / 2);
diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js
@@ -5,10 +5,8 @@ const binding = require(`./build/${common.buildType}/binding`);
 const assert = require('assert');
 
 const skipMessage = 'intensive toString tests due to memory confinements';
-if (!common.enoughTestMem) {
+if (!common.enoughTestMem)
   common.skip(skipMessage);
-  return;
-}
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
@@ -21,14 +19,11 @@ try {
   // If the exception is not due to memory confinement then rethrow it.
   if (e.message !== 'Array buffer allocation failed') throw (e);
   common.skip(skipMessage);
-  return;
 }
 
 // Ensure we have enough memory available for future allocations to succeed.
-if (!binding.ensureAllocation(2 * kStringMaxLength)) {
+if (!binding.ensureAllocation(2 * kStringMaxLength))
   common.skip(skipMessage);
-  return;
-}
 
 assert.throws(function() {
   buf.toString('utf16le');

diff --git a/test/addons/symlinked-module/test.js b/test/addons/symlinked-module/test.js
@@ -22,7 +22,6 @@ try {
 } catch (err) {
   if (err.code !== 'EPERM') throw err;
   common.skip('module identity test (no privs for symlinks)');
-  return;
 }
 
 const sub = require('./submodule');

diff --git a/test/async-hooks/test-connection.ssl.js b/test/async-hooks/test-connection.ssl.js
@@ -6,10 +6,8 @@ const common = require('../common');
 const assert = require('assert');
 const { checkInvocations } = require('./hook-checks');
 
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
 
 const tls = require('tls');
 const Connection = process.binding('crypto').Connection;

diff --git a/test/async-hooks/test-crypto-pbkdf2.js b/test/async-hooks/test-crypto-pbkdf2.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');

diff --git a/test/async-hooks/test-crypto-randomBytes.js b/test/async-hooks/test-crypto-randomBytes.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const common = require('../common');
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
+
 const assert = require('assert');
 const tick = require('./tick');
 const initHooks = require('./init-hooks');

diff --git a/test/async-hooks/test-graph.connection.js b/test/async-hooks/test-graph.connection.js
@@ -4,10 +4,8 @@ const initHooks = require('./init-hooks');
 const common = require('../common');
 const verifyGraph = require('./verify-graph');
 
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
 
 const tls = require('tls');
 const Connection = process.binding('crypto').Connection;

diff --git a/test/async-hooks/test-graph.shutdown.js b/test/async-hooks/test-graph.shutdown.js
@@ -4,10 +4,8 @@ const common = require('../common');
 const initHooks = require('./init-hooks');
 const verifyGraph = require('./verify-graph');
 
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
 const net = require('net');
 

diff --git a/test/async-hooks/test-graph.tcp.js b/test/async-hooks/test-graph.tcp.js
@@ -4,10 +4,8 @@ const common = require('../common');
 const initHooks = require('./init-hooks');
 const verifyGraph = require('./verify-graph');
 
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
 const net = require('net');
 

diff --git a/test/async-hooks/test-graph.tls-write.js b/test/async-hooks/test-graph.tls-write.js
@@ -5,15 +5,11 @@ const initHooks = require('./init-hooks');
 const verifyGraph = require('./verify-graph');
 const fs = require('fs');
 
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
 
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
 const tls = require('tls');
 const hooks = initHooks();

diff --git a/test/async-hooks/test-tcpwrap.js b/test/async-hooks/test-tcpwrap.js
@@ -7,10 +7,8 @@ const tick = require('./tick');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 
-if (!common.hasIPv6) {
+if (!common.hasIPv6)
   common.skip('IPv6 support required');
-  return;
-}
 
 const net = require('net');
 

diff --git a/test/async-hooks/test-tlswrap.js b/test/async-hooks/test-tlswrap.js
@@ -7,10 +7,8 @@ const initHooks = require('./init-hooks');
 const fs = require('fs');
 const { checkInvocations } = require('./hook-checks');
 
-if (!common.hasCrypto) {
+if (!common.hasCrypto)
   common.skip('missing crypto');
-  return;
-}
 
 const tls = require('tls');
 const hooks = initHooks();