From 66a892e508da01350d5f2ca6b6ba1731745c013a Mon Sep 17 00:00:00 2001 From: Sakthipriyan Vairamani Date: Mon, 6 Jul 2015 03:24:12 +0000 Subject: [PATCH 1/2] test: formatting skip messages for TAP parsing This patch makes the skip messages consistent so that the TAP plugin in CI can parse the messages properly. The format will be 1..0 # Skipped: [Actual reason why the test is skipped] --- .../test-cluster-bind-privileged-port.js | 2 +- .../test-cluster-disconnect-unshared-udp.js | 2 +- ...cluster-shared-handle-bind-privileged-port.js | 4 ++-- test/parallel/test-crypto-authenticated.js | 2 +- test/parallel/test-dgram-bind-default-address.js | 2 +- test/parallel/test-dgram-empty-packet.js | 2 +- test/parallel/test-dgram-send-empty-buffer.js | 2 +- test/parallel/test-fs-readfile-error.js | 2 +- test/parallel/test-fs-readfile-pipe-large.js | 2 +- test/parallel/test-fs-readfile-pipe.js | 2 +- test/parallel/test-fs-readfilesync-pipe-large.js | 2 +- test/parallel/test-fs-realpath.js | 16 ++++++++-------- test/parallel/test-http-curl-chunk-problem.js | 2 +- test/parallel/test-http-full-response.js | 2 +- test/parallel/test-http-localaddress.js | 2 +- test/parallel/test-https-foafssl.js | 2 +- test/parallel/test-https-localaddress.js | 2 +- test/parallel/test-intl.js | 6 +++--- test/parallel/test-listen-fd-cluster.js | 2 +- test/parallel/test-listen-fd-detached-inherit.js | 2 +- test/parallel/test-listen-fd-detached.js | 2 +- test/parallel/test-listen-fd-server.js | 2 +- test/parallel/test-module-loading-error.js | 2 +- test/parallel/test-net-connect-options-ipv6.js | 2 +- test/parallel/test-process-getgroups.js | 2 +- test/parallel/test-stdio-closed.js | 2 +- test/parallel/test-tls-alert-handling.js | 2 +- test/parallel/test-tls-alert.js | 2 +- test/parallel/test-tls-no-sslv3.js | 2 +- test/parallel/test-tls-npn-server-client.js | 4 ++-- test/parallel/test-tls-ocsp-callback.js | 6 +++--- test/parallel/test-tls-server-verify.js | 2 +- test/parallel/test-tls-session-cache.js | 2 +- test/parallel/test-tls-set-ciphers.js | 2 +- test/parallel/test-tls-sni-option.js | 4 ++-- test/parallel/test-tls-sni-server-client.js | 4 ++-- test/parallel/test-tty-wrap.js | 2 +- test/pummel/test-abort-fatal-error.js | 2 +- test/pummel/test-dtrace-jsstack.js | 2 +- test/pummel/test-https-ci-reneg-attack.js | 2 +- test/pummel/test-keep-alive.js | 2 +- test/pummel/test-tls-ci-reneg-attack.js | 2 +- test/pummel/test-tls-securepair-client.js | 2 +- test/pummel/test-tls-session-timeout.js | 2 +- test/sequential/test-child-process-emfile.js | 2 +- test/sequential/test-net-server-address.js | 2 +- test/sequential/test-setproctitle.js | 2 +- 47 files changed, 62 insertions(+), 62 deletions(-) diff --git a/test/parallel/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js index b51367aa422..f08accc73a8 100644 --- a/test/parallel/test-cluster-bind-privileged-port.js +++ b/test/parallel/test-cluster-bind-privileged-port.js @@ -5,7 +5,7 @@ var cluster = require('cluster'); var net = require('net'); if (process.platform === 'win32') { - console.log('Skipping test, not reliable on Windows.'); + console.log('1..0 # Skipped: not reliable on Windows.'); process.exit(0); } diff --git a/test/parallel/test-cluster-disconnect-unshared-udp.js b/test/parallel/test-cluster-disconnect-unshared-udp.js index f90152cf68f..5b84e4c83d4 100644 --- a/test/parallel/test-cluster-disconnect-unshared-udp.js +++ b/test/parallel/test-cluster-disconnect-unshared-udp.js @@ -1,6 +1,6 @@ 'use strict'; if (process.platform === 'win32') { - console.log('skipping test on windows, where clustered dgram is ENOTSUP'); + console.log('1..0 # Skipped: on windows, because clustered dgram is ENOTSUP'); process.exit(0); } diff --git a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js index 4fc4b078ad6..82417c25b9b 100644 --- a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js +++ b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js @@ -5,12 +5,12 @@ var cluster = require('cluster'); var net = require('net'); if (process.platform === 'win32') { - console.log('Skipping test, not reliable on Windows.'); + console.log('1..0 # Skipped: not reliable on Windows'); process.exit(0); } if (process.getuid() === 0) { - console.log('Do not run this test as root.'); + console.log('1..0 # Skipped: as this test should not be run as `root`'); process.exit(0); } diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js index 75d733ff98b..9e3ea8ccf13 100644 --- a/test/parallel/test-crypto-authenticated.js +++ b/test/parallel/test-crypto-authenticated.js @@ -56,7 +56,7 @@ for (var i in TEST_CASES) { var test = TEST_CASES[i]; if (ciphers.indexOf(test.algo) == -1) { - console.log('skipping unsupported ' + test.algo + ' test'); + console.log('1..0 # Skipped: unsupported ' + test.algo + ' test'); continue; } diff --git a/test/parallel/test-dgram-bind-default-address.js b/test/parallel/test-dgram-bind-default-address.js index 03e8afb9913..ad42f43829d 100644 --- a/test/parallel/test-dgram-bind-default-address.js +++ b/test/parallel/test-dgram-bind-default-address.js @@ -16,7 +16,7 @@ dgram.createSocket('udp4').bind(common.PORT + 0, common.mustCall(function() { })); if (!common.hasIPv6) { - console.error('Skipping udp6 part of test, no IPv6 support'); + console.log('1..0 # Skipped: udp6 part of test, because no IPv6 support'); return; } diff --git a/test/parallel/test-dgram-empty-packet.js b/test/parallel/test-dgram-empty-packet.js index 797012b8839..ba6faa62d86 100644 --- a/test/parallel/test-dgram-empty-packet.js +++ b/test/parallel/test-dgram-empty-packet.js @@ -9,7 +9,7 @@ var client; var timer; if (process.platform === 'darwin') { - console.error('Test is disabled due to 17894467 Apple bug'); + console.log('1..0 # Skipped: because of 17894467 Apple bug'); return; } diff --git a/test/parallel/test-dgram-send-empty-buffer.js b/test/parallel/test-dgram-send-empty-buffer.js index ab66e0545e6..11f3d38d2ed 100644 --- a/test/parallel/test-dgram-send-empty-buffer.js +++ b/test/parallel/test-dgram-send-empty-buffer.js @@ -8,7 +8,7 @@ var callbacks = 0; var client, timer, buf; if (process.platform === 'darwin') { - console.error('Test is disabled due to 17894467 Apple bug'); + console.log('1..0 # Skipped: because of 17894467 Apple bug'); return; } diff --git a/test/parallel/test-fs-readfile-error.js b/test/parallel/test-fs-readfile-error.js index 6d86ba1a7ec..f782aa585fd 100644 --- a/test/parallel/test-fs-readfile-error.js +++ b/test/parallel/test-fs-readfile-error.js @@ -7,7 +7,7 @@ var path = require('path'); // `fs.readFile('/')` does not fail on FreeBSD, because you can open and read // the directory there. if (process.platform === 'freebsd') { - console.error('Skipping test, platform not supported.'); + console.log('1..0 # Skipped: platform not supported.'); process.exit(); } diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js index 690da928e72..a229d8fba7a 100644 --- a/test/parallel/test-fs-readfile-pipe-large.js +++ b/test/parallel/test-fs-readfile-pipe-large.js @@ -6,7 +6,7 @@ var path = require('path'); // simulate `cat readfile.js | node readfile.js` if (process.platform === 'win32') { - console.error('No /dev/stdin on windows. Skipping test.'); + console.log('1..0 # Skipped: No /dev/stdin on windows.'); process.exit(); } diff --git a/test/parallel/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js index 80cbaeac7cc..2874b0ec04a 100644 --- a/test/parallel/test-fs-readfile-pipe.js +++ b/test/parallel/test-fs-readfile-pipe.js @@ -5,7 +5,7 @@ var assert = require('assert'); // simulate `cat readfile.js | node readfile.js` if (process.platform === 'win32') { - console.error('No /dev/stdin on windows. Skipping test.'); + console.log('1..0 # Skipped: No /dev/stdin on windows.'); process.exit(); } diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js index 991c8589ded..d8a346e756e 100644 --- a/test/parallel/test-fs-readfilesync-pipe-large.js +++ b/test/parallel/test-fs-readfilesync-pipe-large.js @@ -6,7 +6,7 @@ var path = require('path'); // simulate `cat readfile.js | node readfile.js` if (process.platform === 'win32') { - console.error('No /dev/stdin on windows. Skipping test.'); + console.log('1..0 # Skipped: No /dev/stdin on windows.'); process.exit(); } diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index 718ec2f7aac..a87ef2428dc 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -80,7 +80,7 @@ function test_simple_error_callback(cb) { function test_simple_relative_symlink(callback) { console.log('test_simple_relative_symlink'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } var entry = common.tmpDir + '/symlink', @@ -143,7 +143,7 @@ function test_simple_absolute_symlink(callback) { function test_deep_relative_file_symlink(callback) { console.log('test_deep_relative_file_symlink'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } @@ -175,7 +175,7 @@ function test_deep_relative_file_symlink(callback) { function test_deep_relative_dir_symlink(callback) { console.log('test_deep_relative_dir_symlink'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } var expected = path.join(common.fixturesDir, 'cycles', 'folder'); @@ -207,7 +207,7 @@ function test_deep_relative_dir_symlink(callback) { function test_cyclic_link_protection(callback) { console.log('test_cyclic_link_protection'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } var entry = common.tmpDir + '/cycles/realpath-3a'; @@ -230,7 +230,7 @@ function test_cyclic_link_protection(callback) { function test_cyclic_link_overprotection(callback) { console.log('test_cyclic_link_overprotection'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } var cycles = common.tmpDir + '/cycles'; @@ -251,7 +251,7 @@ function test_cyclic_link_overprotection(callback) { function test_relative_input_cwd(callback) { console.log('test_relative_input_cwd'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } @@ -295,7 +295,7 @@ function test_deep_symlink_mix(callback) { if (isWindows) { // This one is a mix of files and directories, and it's quite tricky // to get the file/dir links sorted out correctly. - console.log('skipping symlink test (no way to work on windows)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } @@ -391,7 +391,7 @@ assert.equal(upone, uponeActual, function test_up_multiple(cb) { console.error('test_up_multiple'); if (skipSymlinks) { - console.log('skipping symlink test (no privs)'); + console.log('1..0 # Skipped: symlink test (no privs)'); return runNextTest(); } function cleanup() { diff --git a/test/parallel/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js index 24f85e875af..0e952f1d7e6 100644 --- a/test/parallel/test-http-curl-chunk-problem.js +++ b/test/parallel/test-http-curl-chunk-problem.js @@ -2,7 +2,7 @@ var common = require('../common'); var assert = require('assert'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-http-full-response.js b/test/parallel/test-http-full-response.js index da1b6d7f223..17240c9addb 100644 --- a/test/parallel/test-http-full-response.js +++ b/test/parallel/test-http-full-response.js @@ -27,7 +27,7 @@ function runAb(opts, callback) { exec(command, function(err, stdout, stderr) { if (err) { if (/ab|apr/mi.test(stderr)) { - console.log('problem spawning ab - skipping test.\n' + stderr); + console.log('1..0 # Skipped: problem spawning `ab`.\n' + stderr); process.reallyExit(0); } process.exit(); diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js index 9cc6a80d0b4..5d95a998f6e 100644 --- a/test/parallel/test-http-localaddress.js +++ b/test/parallel/test-http-localaddress.js @@ -4,7 +4,7 @@ var http = require('http'), assert = require('assert'); if (!common.hasMultiLocalhost()) { - console.log('Skipping platform-specific test.'); + console.log('1..0 # Skipped: platform-specific test.'); process.exit(); } diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index f9b382ad830..5ada00c9245 100644 --- a/test/parallel/test-https-foafssl.js +++ b/test/parallel/test-https-foafssl.js @@ -2,7 +2,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js index 0f3241c70b4..94a301f8b0b 100644 --- a/test/parallel/test-https-localaddress.js +++ b/test/parallel/test-https-localaddress.js @@ -10,7 +10,7 @@ if (!common.hasCrypto) { var https = require('https'); if (!common.hasMultiLocalhost()) { - console.log('Skipping platform-specific test.'); + console.log('1..0 # Skipped: platform-specific test.'); process.exit(); } diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js index 8701d90f7c0..7288febf9e6 100644 --- a/test/parallel/test-intl.js +++ b/test/parallel/test-intl.js @@ -24,7 +24,7 @@ if (!haveIntl) { '"Intl" object is NOT present but v8_enable_i18n_support is ' + enablei18n; assert.equal(enablei18n, false, erMsg); - console.log('Skipping Intl tests because Intl object not present.'); + console.log('1..0 # Skipped: Intl tests because Intl object not present.'); } else { var erMsg = @@ -46,8 +46,8 @@ if (!haveIntl) { // If list is specified and doesn't contain 'en' then return. if (process.config.variables.icu_locales && !haveLocale('en')) { - console.log('Skipping detailed Intl tests because English is not listed ' + - 'as supported.'); + console.log('1..0 # Skipped: detailed Intl tests because English is not ' + + 'listed as supported.'); // Smoke test. Does it format anything, or fail? console.log('Date(0) formatted to: ' + dtf.format(date0)); return; diff --git a/test/parallel/test-listen-fd-cluster.js b/test/parallel/test-listen-fd-cluster.js index c3ba42f315d..b10edd33e00 100644 --- a/test/parallel/test-listen-fd-cluster.js +++ b/test/parallel/test-listen-fd-cluster.js @@ -10,7 +10,7 @@ var cluster = require('cluster'); console.error('Cluster listen fd test', process.argv.slice(2)); if (process.platform === 'win32') { - console.error('This test is disabled on windows.'); + console.log('1..0 # Skipped: This test is disabled on windows.'); return; } diff --git a/test/parallel/test-listen-fd-detached-inherit.js b/test/parallel/test-listen-fd-detached-inherit.js index 7e8f7fbaf8a..3660766293d 100644 --- a/test/parallel/test-listen-fd-detached-inherit.js +++ b/test/parallel/test-listen-fd-detached-inherit.js @@ -7,7 +7,7 @@ var PORT = common.PORT; var spawn = require('child_process').spawn; if (process.platform === 'win32') { - console.error('This test is disabled on windows.'); + console.log('1..0 # Skipped: This test is disabled on windows.'); return; } diff --git a/test/parallel/test-listen-fd-detached.js b/test/parallel/test-listen-fd-detached.js index fceedfd2525..b7af1a6a493 100644 --- a/test/parallel/test-listen-fd-detached.js +++ b/test/parallel/test-listen-fd-detached.js @@ -7,7 +7,7 @@ var PORT = common.PORT; var spawn = require('child_process').spawn; if (process.platform === 'win32') { - console.error('This test is disabled on windows.'); + console.log('1..0 # Skipped: This test is disabled on windows.'); return; } diff --git a/test/parallel/test-listen-fd-server.js b/test/parallel/test-listen-fd-server.js index b922c25ee10..8451a79c9e3 100644 --- a/test/parallel/test-listen-fd-server.js +++ b/test/parallel/test-listen-fd-server.js @@ -7,7 +7,7 @@ var PORT = common.PORT; var spawn = require('child_process').spawn; if (process.platform === 'win32') { - console.error('This test is disabled on windows.'); + console.log('1..0 # Skipped: This test is disabled on windows.'); return; } diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js index f33605d44ee..346b04f6352 100644 --- a/test/parallel/test-module-loading-error.js +++ b/test/parallel/test-module-loading-error.js @@ -13,7 +13,7 @@ var error_desc = { var dlerror_msg = error_desc[process.platform]; if (!dlerror_msg) { - console.error('Skipping test, platform not supported.'); + console.log('1..0 # Skipped: platform not supported.'); process.exit(); } diff --git a/test/parallel/test-net-connect-options-ipv6.js b/test/parallel/test-net-connect-options-ipv6.js index 0ac1367ede1..f0f7bc65b3c 100644 --- a/test/parallel/test-net-connect-options-ipv6.js +++ b/test/parallel/test-net-connect-options-ipv6.js @@ -5,7 +5,7 @@ var net = require('net'); var dns = require('dns'); if (!common.hasIPv6) { - console.error('Skipping test, no IPv6 support'); + console.log('1..0 # Skipped: no IPv6 support'); return; } diff --git a/test/parallel/test-process-getgroups.js b/test/parallel/test-process-getgroups.js index 1cb5f38c1db..b18b5a0f2f9 100644 --- a/test/parallel/test-process-getgroups.js +++ b/test/parallel/test-process-getgroups.js @@ -4,7 +4,7 @@ var assert = require('assert'); var exec = require('child_process').exec; if (process.platform === 'darwin') { - console.log('Skipping. Output of `id -G` is unreliable on Darwin.'); + console.log('1..0 # Skipped: Output of `id -G` is unreliable on Darwin.'); return; } diff --git a/test/parallel/test-stdio-closed.js b/test/parallel/test-stdio-closed.js index 2101f85ac06..afa8de96325 100644 --- a/test/parallel/test-stdio-closed.js +++ b/test/parallel/test-stdio-closed.js @@ -4,7 +4,7 @@ var assert = require('assert'); var spawn = require('child_process').spawn; if (process.platform === 'win32') { - console.log('Skipping test, platform not supported.'); + console.log('1..0 # Skipped: platform not supported.'); return; } diff --git a/test/parallel/test-tls-alert-handling.js b/test/parallel/test-tls-alert-handling.js index ed8999b6b7a..fc9d7cdce2b 100644 --- a/test/parallel/test-tls-alert-handling.js +++ b/test/parallel/test-tls-alert-handling.js @@ -3,7 +3,7 @@ var common = require('../common'); var assert = require('assert'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js index 97087d0b3b4..aa42565a704 100644 --- a/test/parallel/test-tls-alert.js +++ b/test/parallel/test-tls-alert.js @@ -3,7 +3,7 @@ var common = require('../common'); var assert = require('assert'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js index 4e1975a1e00..4bdf1dfa588 100644 --- a/test/parallel/test-tls-no-sslv3.js +++ b/test/parallel/test-tls-no-sslv3.js @@ -12,7 +12,7 @@ var fs = require('fs'); var spawn = require('child_process').spawn; if (common.opensslCli === false) { - console.error('Skipping because openssl command cannot be executed'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js index 6e877b7ddef..5d6022fd648 100644 --- a/test/parallel/test-tls-npn-server-client.js +++ b/test/parallel/test-tls-npn-server-client.js @@ -1,7 +1,7 @@ 'use strict'; if (!process.features.tls_npn) { - console.error('Skipping because node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); + console.log('1..0 # Skipped: node compiled without OpenSSL or ' + + 'with old OpenSSL version.'); process.exit(0); } diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js index 73f1c5772a5..e61e49d2928 100644 --- a/test/parallel/test-tls-ocsp-callback.js +++ b/test/parallel/test-tls-ocsp-callback.js @@ -2,12 +2,12 @@ var common = require('../common'); if (!process.features.tls_ocsp) { - console.error('Skipping because node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); + console.log('1..0 # Skipped: node compiled without OpenSSL or ' + + 'with old OpenSSL version.'); process.exit(0); } if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js index 387ede8abc3..825fdfc9509 100644 --- a/test/parallel/test-tls-server-verify.js +++ b/test/parallel/test-tls-server-verify.js @@ -2,7 +2,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js index 9b3da271709..d4a8bdf8d4b 100644 --- a/test/parallel/test-tls-session-cache.js +++ b/test/parallel/test-tls-session-cache.js @@ -2,7 +2,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js index f5284c1b58b..2569d4bfd0b 100644 --- a/test/parallel/test-tls-set-ciphers.js +++ b/test/parallel/test-tls-set-ciphers.js @@ -2,7 +2,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/parallel/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js index 68ef2caa981..733510a0c45 100644 --- a/test/parallel/test-tls-sni-option.js +++ b/test/parallel/test-tls-sni-option.js @@ -1,7 +1,7 @@ 'use strict'; if (!process.features.tls_sni) { - console.error('Skipping because node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); + console.log('1..0 # Skipped: node compiled without OpenSSL or ' + + 'with old OpenSSL version.'); process.exit(0); } diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js index dec829face1..7bda717bb78 100644 --- a/test/parallel/test-tls-sni-server-client.js +++ b/test/parallel/test-tls-sni-server-client.js @@ -1,7 +1,7 @@ 'use strict'; if (!process.features.tls_sni) { - console.error('Skipping because node compiled without OpenSSL or ' + - 'with old OpenSSL version.'); + console.log('1..0 # Skipped: node compiled without OpenSSL or ' + + 'with old OpenSSL version.'); process.exit(0); } diff --git a/test/parallel/test-tty-wrap.js b/test/parallel/test-tty-wrap.js index 370c959ea29..815220865f3 100644 --- a/test/parallel/test-tty-wrap.js +++ b/test/parallel/test-tty-wrap.js @@ -6,7 +6,7 @@ var TTY = process.binding('tty_wrap').TTY; var isTTY = process.binding('tty_wrap').isTTY; if (isTTY(1) == false) { - console.error('fd 1 is not a tty. skipping test.'); + console.log('1..0 # Skipped: fd 1 is not a tty.'); process.exit(0); } diff --git a/test/pummel/test-abort-fatal-error.js b/test/pummel/test-abort-fatal-error.js index 9f012c9dfb1..fb3f0944d74 100644 --- a/test/pummel/test-abort-fatal-error.js +++ b/test/pummel/test-abort-fatal-error.js @@ -3,7 +3,7 @@ var assert = require('assert'); var common = require('../common'); if (process.platform === 'win32') { - console.log('skipping test on windows'); + console.log('1..0 # Skipped: no RLIMIT_NOFILE on Windows'); process.exit(0); } diff --git a/test/pummel/test-dtrace-jsstack.js b/test/pummel/test-dtrace-jsstack.js index 831402fc87c..e21de2153cb 100644 --- a/test/pummel/test-dtrace-jsstack.js +++ b/test/pummel/test-dtrace-jsstack.js @@ -5,7 +5,7 @@ var os = require('os'); var util = require('util'); if (os.type() != 'SunOS') { - console.error('Skipping because DTrace not available.'); + console.log('1..0 # Skipped: no DTRACE support'); process.exit(0); } diff --git a/test/pummel/test-https-ci-reneg-attack.js b/test/pummel/test-https-ci-reneg-attack.js index fa38bea0011..77616b0e275 100644 --- a/test/pummel/test-https-ci-reneg-attack.js +++ b/test/pummel/test-https-ci-reneg-attack.js @@ -13,7 +13,7 @@ var https = require('https'); var fs = require('fs'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/pummel/test-keep-alive.js b/test/pummel/test-keep-alive.js index d03cb1d74f3..24d36588204 100644 --- a/test/pummel/test-keep-alive.js +++ b/test/pummel/test-keep-alive.js @@ -1,6 +1,6 @@ 'use strict'; if (process.platform === 'win32') { - console.log('skipping this test because there is no wrk on windows'); + console.log('1..0 # Skipped: no `wrk` on windows'); process.exit(0); } diff --git a/test/pummel/test-tls-ci-reneg-attack.js b/test/pummel/test-tls-ci-reneg-attack.js index 49b9a87a7db..a3c9ba921cb 100644 --- a/test/pummel/test-tls-ci-reneg-attack.js +++ b/test/pummel/test-tls-ci-reneg-attack.js @@ -12,7 +12,7 @@ var tls = require('tls'); var fs = require('fs'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/pummel/test-tls-securepair-client.js b/test/pummel/test-tls-securepair-client.js index 7542ce62bcd..6d36ae4a367 100644 --- a/test/pummel/test-tls-securepair-client.js +++ b/test/pummel/test-tls-securepair-client.js @@ -4,7 +4,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/pummel/test-tls-session-timeout.js b/test/pummel/test-tls-session-timeout.js index 962b1206b6c..0e8abf7bcbc 100644 --- a/test/pummel/test-tls-session-timeout.js +++ b/test/pummel/test-tls-session-timeout.js @@ -2,7 +2,7 @@ var common = require('../common'); if (!common.opensslCli) { - console.error('Skipping because node compiled without OpenSSL CLI.'); + console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); process.exit(0); } diff --git a/test/sequential/test-child-process-emfile.js b/test/sequential/test-child-process-emfile.js index 964b63a2b45..ad67411e9e5 100644 --- a/test/sequential/test-child-process-emfile.js +++ b/test/sequential/test-child-process-emfile.js @@ -5,7 +5,7 @@ var spawn = require('child_process').spawn; var fs = require('fs'); if (process.platform === 'win32') { - console.log('Skipping test, no RLIMIT_NOFILE on Windows.'); + console.log('1..0 # Skipped: no RLIMIT_NOFILE on Windows'); return; } diff --git a/test/sequential/test-net-server-address.js b/test/sequential/test-net-server-address.js index 1e91c348ef0..8c57cb742e2 100644 --- a/test/sequential/test-net-server-address.js +++ b/test/sequential/test-net-server-address.js @@ -37,7 +37,7 @@ server_ipv6.listen(common.PORT, localhost_ipv6, function() { }); if (!common.hasIPv6) { - console.error('Skipping ipv6 part of test, no IPv6 support'); + console.log('1..0 # Skipped: ipv6 part of test, no IPv6 support'); return; } diff --git a/test/sequential/test-setproctitle.js b/test/sequential/test-setproctitle.js index 61b3e470cde..1c20dc5dd1a 100644 --- a/test/sequential/test-setproctitle.js +++ b/test/sequential/test-setproctitle.js @@ -3,7 +3,7 @@ // FIXME add sunos support if ('linux freebsd darwin'.indexOf(process.platform) === -1) { - console.error('Skipping test, platform not supported.'); + console.log(`1..0 # Skipped: Unsupported platform [${process.platform}]`); process.exit(); } From e8dec36dc3a05d9ce4e012c5e3b1b9144093db52 Mon Sep 17 00:00:00 2001 From: Sakthipriyan Vairamani Date: Tue, 7 Jul 2015 20:55:55 +0530 Subject: [PATCH 2/2] test: changing process.exit to return while skipping tests This patch uses `return` statement to skip the test instead of using `process.exit` call. --- test/internet/test-http-https-default-ports.js | 2 +- test/internet/test-tls-connnect-cnnic.js | 2 +- test/internet/test-tls-connnect-melissadata.js | 2 +- test/internet/test-tls-reuse-host-from-socket.js | 2 +- test/parallel/test-cluster-bind-privileged-port.js | 2 +- test/parallel/test-cluster-disconnect-unshared-udp.js | 2 +- .../test-cluster-shared-handle-bind-privileged-port.js | 4 ++-- test/parallel/test-crypto-authenticated.js | 2 +- test/parallel/test-crypto-binary-default.js | 2 +- test/parallel/test-crypto-certificate.js | 2 +- test/parallel/test-crypto-cipher-decipher.js | 2 +- test/parallel/test-crypto-dh-odd-key.js | 2 +- test/parallel/test-crypto-dh.js | 2 +- test/parallel/test-crypto-domain.js | 2 +- test/parallel/test-crypto-domains.js | 2 +- test/parallel/test-crypto-ecb.js | 2 +- test/parallel/test-crypto-from-binary.js | 2 +- test/parallel/test-crypto-hash-stream-pipe.js | 2 +- test/parallel/test-crypto-hash.js | 2 +- test/parallel/test-crypto-hmac.js | 2 +- test/parallel/test-crypto-padding-aes256.js | 2 +- test/parallel/test-crypto-padding.js | 2 +- test/parallel/test-crypto-pbkdf2.js | 2 +- test/parallel/test-crypto-random.js | 2 +- test/parallel/test-crypto-rsa-dsa.js | 2 +- test/parallel/test-crypto-sign-verify.js | 2 +- test/parallel/test-crypto-stream.js | 2 +- test/parallel/test-crypto-verify-failure.js | 2 +- test/parallel/test-crypto.js | 2 +- test/parallel/test-dgram-bind-default-address.js | 2 +- test/parallel/test-fs-readfile-error.js | 2 +- test/parallel/test-fs-readfile-pipe-large.js | 2 +- test/parallel/test-fs-readfile-pipe.js | 2 +- test/parallel/test-fs-readfilesync-pipe-large.js | 2 +- test/parallel/test-http-curl-chunk-problem.js | 2 +- test/parallel/test-http-localaddress.js | 2 +- test/parallel/test-http-url.parse-https.request.js | 2 +- test/parallel/test-https-agent-servername.js | 2 +- test/parallel/test-https-agent.js | 2 +- test/parallel/test-https-byteswritten.js | 2 +- test/parallel/test-https-client-checkServerIdentity.js | 2 +- test/parallel/test-https-client-get-url.js | 2 +- test/parallel/test-https-client-reject.js | 2 +- test/parallel/test-https-client-resume.js | 2 +- test/parallel/test-https-connecting-to-http.js | 2 +- test/parallel/test-https-drain.js | 2 +- test/parallel/test-https-eof-for-eom.js | 2 +- test/parallel/test-https-foafssl.js | 4 ++-- test/parallel/test-https-host-headers.js | 2 +- test/parallel/test-https-localaddress-bind-error.js | 2 +- test/parallel/test-https-localaddress.js | 4 ++-- test/parallel/test-https-pfx.js | 2 +- test/parallel/test-https-req-split.js | 2 +- test/parallel/test-https-set-timeout-server.js | 2 +- test/parallel/test-https-simple.js | 2 +- test/parallel/test-https-socket-options.js | 2 +- test/parallel/test-https-strict.js | 2 +- test/parallel/test-https-timeout-server-2.js | 2 +- test/parallel/test-https-timeout-server.js | 2 +- test/parallel/test-https-timeout.js | 2 +- test/parallel/test-https-truncate.js | 2 +- test/parallel/test-module-loading-error.js | 2 +- test/parallel/test-stream2-unpipe-drain.js | 2 +- test/parallel/test-tls-0-dns-altname.js | 2 +- test/parallel/test-tls-alert-handling.js | 4 ++-- test/parallel/test-tls-alert.js | 4 ++-- test/parallel/test-tls-async-cb-after-socket-end.js | 2 +- test/parallel/test-tls-cert-regression.js | 2 +- test/parallel/test-tls-check-server-identity.js | 2 +- test/parallel/test-tls-client-abort.js | 2 +- test/parallel/test-tls-client-abort2.js | 2 +- test/parallel/test-tls-client-default-ciphers.js | 2 +- test/parallel/test-tls-client-destroy-soon.js | 2 +- test/parallel/test-tls-client-reject.js | 2 +- test/parallel/test-tls-client-resume.js | 2 +- test/parallel/test-tls-client-verify.js | 2 +- test/parallel/test-tls-close-error.js | 2 +- test/parallel/test-tls-close-notify.js | 2 +- test/parallel/test-tls-cnnic-whitelist.js | 2 +- test/parallel/test-tls-connect-given-socket.js | 2 +- test/parallel/test-tls-connect-no-host.js | 2 +- test/parallel/test-tls-connect-pipe.js | 2 +- test/parallel/test-tls-connect-simple.js | 2 +- test/parallel/test-tls-connect.js | 2 +- test/parallel/test-tls-delayed-attach-error.js | 2 +- test/parallel/test-tls-delayed-attach.js | 2 +- test/parallel/test-tls-destroy-whilst-write.js | 2 +- test/parallel/test-tls-dhe.js | 2 +- test/parallel/test-tls-ecdh-disable.js | 2 +- test/parallel/test-tls-ecdh.js | 2 +- test/parallel/test-tls-econnreset.js | 2 +- test/parallel/test-tls-fast-writing.js | 2 +- test/parallel/test-tls-friendly-error-message.js | 2 +- test/parallel/test-tls-getcipher.js | 2 +- test/parallel/test-tls-handshake-error.js | 2 +- test/parallel/test-tls-handshake-nohang.js | 2 +- test/parallel/test-tls-hello-parser-failure.js | 2 +- test/parallel/test-tls-inception.js | 2 +- test/parallel/test-tls-interleave.js | 2 +- test/parallel/test-tls-invoke-queued.js | 2 +- test/parallel/test-tls-js-stream.js | 2 +- test/parallel/test-tls-junk-closes-server.js | 2 +- test/parallel/test-tls-key-mismatch.js | 2 +- test/parallel/test-tls-max-send-fragment.js | 2 +- test/parallel/test-tls-multi-key.js | 2 +- test/parallel/test-tls-no-cert-required.js | 2 +- test/parallel/test-tls-no-rsa-key.js | 2 +- test/parallel/test-tls-no-sslv23.js | 2 +- test/parallel/test-tls-no-sslv3.js | 4 ++-- test/parallel/test-tls-npn-server-client.js | 2 +- test/parallel/test-tls-ocsp-callback.js | 4 ++-- test/parallel/test-tls-on-empty-socket.js | 2 +- test/parallel/test-tls-over-http-tunnel.js | 2 +- test/parallel/test-tls-passphrase.js | 2 +- test/parallel/test-tls-pause.js | 2 +- test/parallel/test-tls-peer-certificate-encoding.js | 2 +- test/parallel/test-tls-peer-certificate-multi-keys.js | 2 +- test/parallel/test-tls-peer-certificate.js | 2 +- test/parallel/test-tls-request-timeout.js | 2 +- test/parallel/test-tls-securepair-server.js | 2 +- test/parallel/test-tls-server-verify.js | 4 ++-- test/parallel/test-tls-session-cache.js | 4 ++-- test/parallel/test-tls-set-ciphers.js | 4 ++-- test/parallel/test-tls-set-encoding.js | 2 +- test/parallel/test-tls-sni-option.js | 2 +- test/parallel/test-tls-sni-server-client.js | 2 +- test/parallel/test-tls-ticket-cluster.js | 2 +- test/parallel/test-tls-ticket.js | 2 +- test/parallel/test-tls-timeout-server-2.js | 2 +- test/parallel/test-tls-timeout-server.js | 2 +- test/parallel/test-tls-wrap-timeout.js | 2 +- test/parallel/test-tls-zero-clear-in.js | 2 +- test/parallel/test-tty-wrap.js | 2 +- test/parallel/test-zlib-random-byte-pipes.js | 2 +- test/pummel/test-abort-fatal-error.js | 2 +- test/pummel/test-dh-regr.js | 2 +- test/pummel/test-dtrace-jsstack.js | 2 +- test/pummel/test-https-ci-reneg-attack.js | 4 ++-- test/pummel/test-https-large-response.js | 2 +- test/pummel/test-https-no-reader.js | 2 +- test/pummel/test-keep-alive.js | 2 +- test/pummel/test-regress-GH-892.js | 2 +- test/pummel/test-tls-ci-reneg-attack.js | 4 ++-- test/pummel/test-tls-connect-memleak.js | 2 +- test/pummel/test-tls-securepair-client.js | 4 ++-- test/pummel/test-tls-server-large-request.js | 2 +- test/pummel/test-tls-session-timeout.js | 4 ++-- test/pummel/test-tls-throttle.js | 2 +- test/sequential/test-regress-GH-1531.js | 2 +- test/sequential/test-setproctitle.js | 2 +- test/sequential/test-tls-honorcipherorder.js | 2 +- 151 files changed, 165 insertions(+), 165 deletions(-) diff --git a/test/internet/test-http-https-default-ports.js b/test/internet/test-http-https-default-ports.js index 1133221e6b7..dbc50c65033 100644 --- a/test/internet/test-http-https-default-ports.js +++ b/test/internet/test-http-https-default-ports.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/internet/test-tls-connnect-cnnic.js b/test/internet/test-tls-connnect-cnnic.js index d95685a3f70..01e15340c99 100644 --- a/test/internet/test-tls-connnect-cnnic.js +++ b/test/internet/test-tls-connnect-cnnic.js @@ -11,7 +11,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/internet/test-tls-connnect-melissadata.js b/test/internet/test-tls-connnect-melissadata.js index 326e76cb240..36795f35530 100644 --- a/test/internet/test-tls-connnect-melissadata.js +++ b/test/internet/test-tls-connnect-melissadata.js @@ -5,7 +5,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/internet/test-tls-reuse-host-from-socket.js b/test/internet/test-tls-reuse-host-from-socket.js index f3864908155..2ba6b5c816c 100644 --- a/test/internet/test-tls-reuse-host-from-socket.js +++ b/test/internet/test-tls-reuse-host-from-socket.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js index f08accc73a8..6bb83efe5c6 100644 --- a/test/parallel/test-cluster-bind-privileged-port.js +++ b/test/parallel/test-cluster-bind-privileged-port.js @@ -6,7 +6,7 @@ var net = require('net'); if (process.platform === 'win32') { console.log('1..0 # Skipped: not reliable on Windows.'); - process.exit(0); + return; } if (process.getuid() === 0) { diff --git a/test/parallel/test-cluster-disconnect-unshared-udp.js b/test/parallel/test-cluster-disconnect-unshared-udp.js index 5b84e4c83d4..0d3eb2a5ad7 100644 --- a/test/parallel/test-cluster-disconnect-unshared-udp.js +++ b/test/parallel/test-cluster-disconnect-unshared-udp.js @@ -1,7 +1,7 @@ 'use strict'; if (process.platform === 'win32') { console.log('1..0 # Skipped: on windows, because clustered dgram is ENOTSUP'); - process.exit(0); + return; } var cluster = require('cluster'); diff --git a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js index 82417c25b9b..188f6fb2081 100644 --- a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js +++ b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js @@ -6,12 +6,12 @@ var net = require('net'); if (process.platform === 'win32') { console.log('1..0 # Skipped: not reliable on Windows'); - process.exit(0); + return; } if (process.getuid() === 0) { console.log('1..0 # Skipped: as this test should not be run as `root`'); - process.exit(0); + return; } if (cluster.isMaster) { diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js index 9e3ea8ccf13..2cc36278332 100644 --- a/test/parallel/test-crypto-authenticated.js +++ b/test/parallel/test-crypto-authenticated.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js index 8623ff47742..bebc91dc8ed 100644 --- a/test/parallel/test-crypto-binary-default.js +++ b/test/parallel/test-crypto-binary-default.js @@ -9,7 +9,7 @@ var constants = require('constants'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); var tls = require('tls'); diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js index ab0d4ca9dff..8286d58d1e4 100644 --- a/test/parallel/test-crypto-certificate.js +++ b/test/parallel/test-crypto-certificate.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js index 931cf339bbb..f33ea5482c8 100644 --- a/test/parallel/test-crypto-cipher-decipher.js +++ b/test/parallel/test-crypto-cipher-decipher.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-dh-odd-key.js b/test/parallel/test-crypto-dh-odd-key.js index 1c7f4f69bb4..abb4860b238 100644 --- a/test/parallel/test-crypto-dh-odd-key.js +++ b/test/parallel/test-crypto-dh-odd-key.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js index 4978ab2ebbc..dfb912c0a4c 100644 --- a/test/parallel/test-crypto-dh.js +++ b/test/parallel/test-crypto-dh.js @@ -5,7 +5,7 @@ var constants = require('constants'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-domain.js b/test/parallel/test-crypto-domain.js index fe5e72982d5..349ce7e1fc9 100644 --- a/test/parallel/test-crypto-domain.js +++ b/test/parallel/test-crypto-domain.js @@ -5,7 +5,7 @@ var domain = require('domain'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-domains.js b/test/parallel/test-crypto-domains.js index 55c67b490db..ca93d20fdf2 100644 --- a/test/parallel/test-crypto-domains.js +++ b/test/parallel/test-crypto-domains.js @@ -8,7 +8,7 @@ var errors = 0; if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-ecb.js b/test/parallel/test-crypto-ecb.js index f1541ddeb40..920b18a47f8 100644 --- a/test/parallel/test-crypto-ecb.js +++ b/test/parallel/test-crypto-ecb.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-from-binary.js b/test/parallel/test-crypto-from-binary.js index 4c8d7338dd9..78e3b456779 100644 --- a/test/parallel/test-crypto-from-binary.js +++ b/test/parallel/test-crypto-from-binary.js @@ -8,7 +8,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-hash-stream-pipe.js b/test/parallel/test-crypto-hash-stream-pipe.js index 23feccea384..c41f91241d5 100644 --- a/test/parallel/test-crypto-hash-stream-pipe.js +++ b/test/parallel/test-crypto-hash-stream-pipe.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-hash.js b/test/parallel/test-crypto-hash.js index 5c542406cb7..95bb1bc7d86 100644 --- a/test/parallel/test-crypto-hash.js +++ b/test/parallel/test-crypto-hash.js @@ -6,7 +6,7 @@ var path = require('path'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-hmac.js b/test/parallel/test-crypto-hmac.js index e234bd91606..692954caabd 100644 --- a/test/parallel/test-crypto-hmac.js +++ b/test/parallel/test-crypto-hmac.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-padding-aes256.js b/test/parallel/test-crypto-padding-aes256.js index db75a07c9e1..550aa5c061f 100644 --- a/test/parallel/test-crypto-padding-aes256.js +++ b/test/parallel/test-crypto-padding-aes256.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-padding.js b/test/parallel/test-crypto-padding.js index 11b1729fde8..d4cb7190e20 100644 --- a/test/parallel/test-crypto-padding.js +++ b/test/parallel/test-crypto-padding.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js index 88be15b68cb..885831bad16 100644 --- a/test/parallel/test-crypto-pbkdf2.js +++ b/test/parallel/test-crypto-pbkdf2.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js index cac0c9b86cf..3454796a6b1 100644 --- a/test/parallel/test-crypto-random.js +++ b/test/parallel/test-crypto-random.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js index 127bbfb26df..ebbc15c2d42 100644 --- a/test/parallel/test-crypto-rsa-dsa.js +++ b/test/parallel/test-crypto-rsa-dsa.js @@ -6,7 +6,7 @@ var constants = require('constants'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js index fb811e7f12d..e4cb9fc41cc 100644 --- a/test/parallel/test-crypto-sign-verify.js +++ b/test/parallel/test-crypto-sign-verify.js @@ -5,7 +5,7 @@ var fs = require('fs'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-stream.js b/test/parallel/test-crypto-stream.js index fd970e061b0..727e6a16a70 100644 --- a/test/parallel/test-crypto-stream.js +++ b/test/parallel/test-crypto-stream.js @@ -6,7 +6,7 @@ var util = require('util'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-crypto-verify-failure.js b/test/parallel/test-crypto-verify-failure.js index a4a9ec69819..f315aed1a9f 100644 --- a/test/parallel/test-crypto-verify-failure.js +++ b/test/parallel/test-crypto-verify-failure.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); var tls = require('tls'); diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js index 47f0430f167..55b57e65154 100644 --- a/test/parallel/test-crypto.js +++ b/test/parallel/test-crypto.js @@ -5,7 +5,7 @@ var util = require('util'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-dgram-bind-default-address.js b/test/parallel/test-dgram-bind-default-address.js index ad42f43829d..75069e36186 100644 --- a/test/parallel/test-dgram-bind-default-address.js +++ b/test/parallel/test-dgram-bind-default-address.js @@ -6,7 +6,7 @@ var dgram = require('dgram'); // skip test in FreeBSD jails since 0.0.0.0 will resolve to default interface if (common.inFreeBSDJail) { console.log('1..0 # Skipped: In a FreeBSD jail'); - process.exit(); + return; } dgram.createSocket('udp4').bind(common.PORT + 0, common.mustCall(function() { diff --git a/test/parallel/test-fs-readfile-error.js b/test/parallel/test-fs-readfile-error.js index f782aa585fd..c198d7d0ebc 100644 --- a/test/parallel/test-fs-readfile-error.js +++ b/test/parallel/test-fs-readfile-error.js @@ -8,7 +8,7 @@ var path = require('path'); // the directory there. if (process.platform === 'freebsd') { console.log('1..0 # Skipped: platform not supported.'); - process.exit(); + return; } var callbacks = 0; diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js index a229d8fba7a..66f955a5614 100644 --- a/test/parallel/test-fs-readfile-pipe-large.js +++ b/test/parallel/test-fs-readfile-pipe-large.js @@ -7,7 +7,7 @@ var path = require('path'); if (process.platform === 'win32') { console.log('1..0 # Skipped: No /dev/stdin on windows.'); - process.exit(); + return; } var fs = require('fs'); diff --git a/test/parallel/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js index 2874b0ec04a..2ac547e5c72 100644 --- a/test/parallel/test-fs-readfile-pipe.js +++ b/test/parallel/test-fs-readfile-pipe.js @@ -6,7 +6,7 @@ var assert = require('assert'); if (process.platform === 'win32') { console.log('1..0 # Skipped: No /dev/stdin on windows.'); - process.exit(); + return; } var fs = require('fs'); diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js index d8a346e756e..e9045b27f17 100644 --- a/test/parallel/test-fs-readfilesync-pipe-large.js +++ b/test/parallel/test-fs-readfilesync-pipe-large.js @@ -7,7 +7,7 @@ var path = require('path'); if (process.platform === 'win32') { console.log('1..0 # Skipped: No /dev/stdin on windows.'); - process.exit(); + return; } var fs = require('fs'); diff --git a/test/parallel/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js index 0e952f1d7e6..f3e3a243287 100644 --- a/test/parallel/test-http-curl-chunk-problem.js +++ b/test/parallel/test-http-curl-chunk-problem.js @@ -3,7 +3,7 @@ var common = require('../common'); var assert = require('assert'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } // http://groups.google.com/group/nodejs/browse_thread/thread/f66cd3c960406919 diff --git a/test/parallel/test-http-localaddress.js b/test/parallel/test-http-localaddress.js index 5d95a998f6e..ac5de820263 100644 --- a/test/parallel/test-http-localaddress.js +++ b/test/parallel/test-http-localaddress.js @@ -5,7 +5,7 @@ var http = require('http'), if (!common.hasMultiLocalhost()) { console.log('1..0 # Skipped: platform-specific test.'); - process.exit(); + return; } var server = http.createServer(function(req, res) { diff --git a/test/parallel/test-http-url.parse-https.request.js b/test/parallel/test-http-url.parse-https.request.js index 7fb749b069d..10c40ec0310 100644 --- a/test/parallel/test-http-url.parse-https.request.js +++ b/test/parallel/test-http-url.parse-https.request.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-agent-servername.js b/test/parallel/test-https-agent-servername.js index 5af9af98180..2be40836a04 100644 --- a/test/parallel/test-https-agent-servername.js +++ b/test/parallel/test-https-agent-servername.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-agent.js b/test/parallel/test-https-agent.js index a26882844e3..a3bb28975a3 100644 --- a/test/parallel/test-https-agent.js +++ b/test/parallel/test-https-agent.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-byteswritten.js b/test/parallel/test-https-byteswritten.js index 3e50b6f84dc..5163eccc262 100644 --- a/test/parallel/test-https-byteswritten.js +++ b/test/parallel/test-https-byteswritten.js @@ -6,7 +6,7 @@ var http = require('http'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-client-checkServerIdentity.js b/test/parallel/test-https-client-checkServerIdentity.js index 8f4aad7f5ef..e49427dcc76 100644 --- a/test/parallel/test-https-client-checkServerIdentity.js +++ b/test/parallel/test-https-client-checkServerIdentity.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-client-get-url.js b/test/parallel/test-https-client-get-url.js index 66c11cd2db3..e8922de9434 100644 --- a/test/parallel/test-https-client-get-url.js +++ b/test/parallel/test-https-client-get-url.js @@ -7,7 +7,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-client-reject.js b/test/parallel/test-https-client-reject.js index 55c335289d4..fc76e5b80f5 100644 --- a/test/parallel/test-https-client-reject.js +++ b/test/parallel/test-https-client-reject.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-client-resume.js b/test/parallel/test-https-client-resume.js index 024c5fa17f6..8f849b14b58 100644 --- a/test/parallel/test-https-client-resume.js +++ b/test/parallel/test-https-client-resume.js @@ -7,7 +7,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-connecting-to-http.js b/test/parallel/test-https-connecting-to-http.js index 64adb776032..755abf9427f 100644 --- a/test/parallel/test-https-connecting-to-http.js +++ b/test/parallel/test-https-connecting-to-http.js @@ -7,7 +7,7 @@ var http = require('http'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-drain.js b/test/parallel/test-https-drain.js index 0ce55b0849b..43113ef980b 100644 --- a/test/parallel/test-https-drain.js +++ b/test/parallel/test-https-drain.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-eof-for-eom.js b/test/parallel/test-https-eof-for-eom.js index 78a2f3828cb..0445625bace 100644 --- a/test/parallel/test-https-eof-for-eom.js +++ b/test/parallel/test-https-eof-for-eom.js @@ -12,7 +12,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); var tls = require('tls'); diff --git a/test/parallel/test-https-foafssl.js b/test/parallel/test-https-foafssl.js index 5ada00c9245..7a3ceb9404f 100644 --- a/test/parallel/test-https-foafssl.js +++ b/test/parallel/test-https-foafssl.js @@ -3,7 +3,7 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } var assert = require('assert'); @@ -14,7 +14,7 @@ var spawn = require('child_process').spawn; if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-host-headers.js b/test/parallel/test-https-host-headers.js index 6a828d4aabb..0ea32f320e7 100644 --- a/test/parallel/test-https-host-headers.js +++ b/test/parallel/test-https-host-headers.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-localaddress-bind-error.js b/test/parallel/test-https-localaddress-bind-error.js index 21e630dee43..b3cb4ffe6b0 100644 --- a/test/parallel/test-https-localaddress-bind-error.js +++ b/test/parallel/test-https-localaddress-bind-error.js @@ -5,7 +5,7 @@ var fs = require('fs'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-localaddress.js b/test/parallel/test-https-localaddress.js index 94a301f8b0b..a330c4881a9 100644 --- a/test/parallel/test-https-localaddress.js +++ b/test/parallel/test-https-localaddress.js @@ -5,13 +5,13 @@ var common = require('../common'), if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); if (!common.hasMultiLocalhost()) { console.log('1..0 # Skipped: platform-specific test.'); - process.exit(); + return; } var options = { diff --git a/test/parallel/test-https-pfx.js b/test/parallel/test-https-pfx.js index f3968588333..5e080b4e3de 100644 --- a/test/parallel/test-https-pfx.js +++ b/test/parallel/test-https-pfx.js @@ -5,7 +5,7 @@ var fs = require('fs'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-req-split.js b/test/parallel/test-https-req-split.js index 4fd48eb1615..479fff36b4e 100644 --- a/test/parallel/test-https-req-split.js +++ b/test/parallel/test-https-req-split.js @@ -7,7 +7,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js index c10878110c3..bfea7c4d5d5 100644 --- a/test/parallel/test-https-set-timeout-server.js +++ b/test/parallel/test-https-set-timeout-server.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-simple.js b/test/parallel/test-https-simple.js index c2b93fdef85..2401ad2586b 100644 --- a/test/parallel/test-https-simple.js +++ b/test/parallel/test-https-simple.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-socket-options.js b/test/parallel/test-https-socket-options.js index 52e46bd20b7..44e179f27a8 100644 --- a/test/parallel/test-https-socket-options.js +++ b/test/parallel/test-https-socket-options.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-strict.js b/test/parallel/test-https-strict.js index 46d65ae3935..65ebfabde2b 100644 --- a/test/parallel/test-https-strict.js +++ b/test/parallel/test-https-strict.js @@ -7,7 +7,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js index 5da7c833268..9970688fe7c 100644 --- a/test/parallel/test-https-timeout-server-2.js +++ b/test/parallel/test-https-timeout-server-2.js @@ -5,7 +5,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-timeout-server.js b/test/parallel/test-https-timeout-server.js index 2707c30d181..0db7ad533d9 100644 --- a/test/parallel/test-https-timeout-server.js +++ b/test/parallel/test-https-timeout-server.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-timeout.js b/test/parallel/test-https-timeout.js index f6f13751809..7f34c18bec0 100644 --- a/test/parallel/test-https-timeout.js +++ b/test/parallel/test-https-timeout.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-https-truncate.js b/test/parallel/test-https-truncate.js index 3ac87ba3522..e77bf29ed25 100644 --- a/test/parallel/test-https-truncate.js +++ b/test/parallel/test-https-truncate.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js index 346b04f6352..f430b65d8cf 100644 --- a/test/parallel/test-module-loading-error.js +++ b/test/parallel/test-module-loading-error.js @@ -14,7 +14,7 @@ var dlerror_msg = error_desc[process.platform]; if (!dlerror_msg) { console.log('1..0 # Skipped: platform not supported.'); - process.exit(); + return; } try { diff --git a/test/parallel/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js index a430e4a58d6..daad70a282a 100644 --- a/test/parallel/test-stream2-unpipe-drain.js +++ b/test/parallel/test-stream2-unpipe-drain.js @@ -5,7 +5,7 @@ var stream = require('stream'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/parallel/test-tls-0-dns-altname.js b/test/parallel/test-tls-0-dns-altname.js index fd10206a126..61458142bc0 100644 --- a/test/parallel/test-tls-0-dns-altname.js +++ b/test/parallel/test-tls-0-dns-altname.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-alert-handling.js b/test/parallel/test-tls-alert-handling.js index fc9d7cdce2b..5e63384b002 100644 --- a/test/parallel/test-tls-alert-handling.js +++ b/test/parallel/test-tls-alert-handling.js @@ -4,12 +4,12 @@ var assert = require('assert'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-alert.js b/test/parallel/test-tls-alert.js index aa42565a704..10b43312507 100644 --- a/test/parallel/test-tls-alert.js +++ b/test/parallel/test-tls-alert.js @@ -4,12 +4,12 @@ var assert = require('assert'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-async-cb-after-socket-end.js b/test/parallel/test-tls-async-cb-after-socket-end.js index db9db87f590..87258cb32c5 100644 --- a/test/parallel/test-tls-async-cb-after-socket-end.js +++ b/test/parallel/test-tls-async-cb-after-socket-end.js @@ -9,7 +9,7 @@ var constants = require('constants'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-cert-regression.js b/test/parallel/test-tls-cert-regression.js index 24bc4242749..6e546600b68 100644 --- a/test/parallel/test-tls-cert-regression.js +++ b/test/parallel/test-tls-cert-regression.js @@ -4,7 +4,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-check-server-identity.js b/test/parallel/test-tls-check-server-identity.js index e40cbb0f9da..e659f40aa90 100644 --- a/test/parallel/test-tls-check-server-identity.js +++ b/test/parallel/test-tls-check-server-identity.js @@ -5,7 +5,7 @@ var util = require('util'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-abort.js b/test/parallel/test-tls-client-abort.js index 25e44716c1d..934162c35a4 100644 --- a/test/parallel/test-tls-client-abort.js +++ b/test/parallel/test-tls-client-abort.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-abort2.js b/test/parallel/test-tls-client-abort2.js index b64482b58dc..194882e7d52 100644 --- a/test/parallel/test-tls-client-abort2.js +++ b/test/parallel/test-tls-client-abort2.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-default-ciphers.js b/test/parallel/test-tls-client-default-ciphers.js index 5da57173315..e38671fd6f9 100644 --- a/test/parallel/test-tls-client-default-ciphers.js +++ b/test/parallel/test-tls-client-default-ciphers.js @@ -4,7 +4,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-destroy-soon.js b/test/parallel/test-tls-client-destroy-soon.js index 6a1a899103d..554ac686dbd 100644 --- a/test/parallel/test-tls-client-destroy-soon.js +++ b/test/parallel/test-tls-client-destroy-soon.js @@ -8,7 +8,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-reject.js b/test/parallel/test-tls-client-reject.js index 9e09493c6a4..f2b93393e7d 100644 --- a/test/parallel/test-tls-client-reject.js +++ b/test/parallel/test-tls-client-reject.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-resume.js b/test/parallel/test-tls-client-resume.js index 8b36224a7f2..002151b7d82 100644 --- a/test/parallel/test-tls-client-resume.js +++ b/test/parallel/test-tls-client-resume.js @@ -8,7 +8,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-client-verify.js b/test/parallel/test-tls-client-verify.js index f206929f595..b4014ab351d 100644 --- a/test/parallel/test-tls-client-verify.js +++ b/test/parallel/test-tls-client-verify.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-close-error.js b/test/parallel/test-tls-close-error.js index 556fb1df12c..5c5a797c280 100644 --- a/test/parallel/test-tls-close-error.js +++ b/test/parallel/test-tls-close-error.js @@ -5,7 +5,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-close-notify.js b/test/parallel/test-tls-close-notify.js index cfb9aab0d97..5cc3021ab8d 100644 --- a/test/parallel/test-tls-close-notify.js +++ b/test/parallel/test-tls-close-notify.js @@ -4,7 +4,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-cnnic-whitelist.js b/test/parallel/test-tls-cnnic-whitelist.js index 759ce3230fd..2449a5d6e20 100644 --- a/test/parallel/test-tls-cnnic-whitelist.js +++ b/test/parallel/test-tls-cnnic-whitelist.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-connect-given-socket.js b/test/parallel/test-tls-connect-given-socket.js index 902b67aa515..2fd44d87010 100644 --- a/test/parallel/test-tls-connect-given-socket.js +++ b/test/parallel/test-tls-connect-given-socket.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-connect-no-host.js b/test/parallel/test-tls-connect-no-host.js index 6d04890d4dc..3f347f5e17b 100644 --- a/test/parallel/test-tls-connect-no-host.js +++ b/test/parallel/test-tls-connect-no-host.js @@ -3,7 +3,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-connect-pipe.js b/test/parallel/test-tls-connect-pipe.js index bded532720f..4d607a88830 100644 --- a/test/parallel/test-tls-connect-pipe.js +++ b/test/parallel/test-tls-connect-pipe.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-connect-simple.js b/test/parallel/test-tls-connect-simple.js index feaa7c887b1..f56b4baed72 100644 --- a/test/parallel/test-tls-connect-simple.js +++ b/test/parallel/test-tls-connect-simple.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-connect.js b/test/parallel/test-tls-connect.js index 160d874bed3..ce4317ac302 100644 --- a/test/parallel/test-tls-connect.js +++ b/test/parallel/test-tls-connect.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-delayed-attach-error.js b/test/parallel/test-tls-delayed-attach-error.js index e2dbc5815d2..aec76d11b56 100644 --- a/test/parallel/test-tls-delayed-attach-error.js +++ b/test/parallel/test-tls-delayed-attach-error.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var fs = require('fs'); diff --git a/test/parallel/test-tls-delayed-attach.js b/test/parallel/test-tls-delayed-attach.js index a5b312d1633..2fbafd8ecb3 100644 --- a/test/parallel/test-tls-delayed-attach.js +++ b/test/parallel/test-tls-delayed-attach.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-destroy-whilst-write.js b/test/parallel/test-tls-destroy-whilst-write.js index 8b865fab178..f42ed1d4ea7 100644 --- a/test/parallel/test-tls-destroy-whilst-write.js +++ b/test/parallel/test-tls-destroy-whilst-write.js @@ -4,7 +4,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var stream = require('stream'); diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js index 92fff3f221b..7dab1faa419 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-ecdh-disable.js b/test/parallel/test-tls-ecdh-disable.js index 1ed4ea35738..454e177ed74 100644 --- a/test/parallel/test-tls-ecdh-disable.js +++ b/test/parallel/test-tls-ecdh-disable.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js index cd144d79e0e..2ffa970f383 100644 --- a/test/parallel/test-tls-ecdh.js +++ b/test/parallel/test-tls-ecdh.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-econnreset.js b/test/parallel/test-tls-econnreset.js index f451df68470..6ef629a159a 100644 --- a/test/parallel/test-tls-econnreset.js +++ b/test/parallel/test-tls-econnreset.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-fast-writing.js b/test/parallel/test-tls-fast-writing.js index 24e8bfc6886..009fa40b631 100644 --- a/test/parallel/test-tls-fast-writing.js +++ b/test/parallel/test-tls-fast-writing.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-friendly-error-message.js b/test/parallel/test-tls-friendly-error-message.js index b2f2de137da..ee2c21f6b5c 100644 --- a/test/parallel/test-tls-friendly-error-message.js +++ b/test/parallel/test-tls-friendly-error-message.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-getcipher.js b/test/parallel/test-tls-getcipher.js index 12e3b8f9c64..62209c771cb 100644 --- a/test/parallel/test-tls-getcipher.js +++ b/test/parallel/test-tls-getcipher.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-handshake-error.js b/test/parallel/test-tls-handshake-error.js index dbe91d0943c..f33177455f8 100644 --- a/test/parallel/test-tls-handshake-error.js +++ b/test/parallel/test-tls-handshake-error.js @@ -5,7 +5,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-handshake-nohang.js b/test/parallel/test-tls-handshake-nohang.js index 181d6408e05..ae07551ef98 100644 --- a/test/parallel/test-tls-handshake-nohang.js +++ b/test/parallel/test-tls-handshake-nohang.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-hello-parser-failure.js b/test/parallel/test-tls-hello-parser-failure.js index 3ed82c536a9..3378583af22 100644 --- a/test/parallel/test-tls-hello-parser-failure.js +++ b/test/parallel/test-tls-hello-parser-failure.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-inception.js b/test/parallel/test-tls-inception.js index 76e6fe077ff..df03cf934fc 100644 --- a/test/parallel/test-tls-inception.js +++ b/test/parallel/test-tls-inception.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-interleave.js b/test/parallel/test-tls-interleave.js index e726e16998a..fd93a05e593 100644 --- a/test/parallel/test-tls-interleave.js +++ b/test/parallel/test-tls-interleave.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-invoke-queued.js b/test/parallel/test-tls-invoke-queued.js index f9607e1f4fa..f833108ea3f 100644 --- a/test/parallel/test-tls-invoke-queued.js +++ b/test/parallel/test-tls-invoke-queued.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-js-stream.js b/test/parallel/test-tls-js-stream.js index 292bd4fd912..1c5e749911b 100644 --- a/test/parallel/test-tls-js-stream.js +++ b/test/parallel/test-tls-js-stream.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-junk-closes-server.js b/test/parallel/test-tls-junk-closes-server.js index 01a83ef214e..5ee4e025f5d 100644 --- a/test/parallel/test-tls-junk-closes-server.js +++ b/test/parallel/test-tls-junk-closes-server.js @@ -3,7 +3,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-key-mismatch.js b/test/parallel/test-tls-key-mismatch.js index 35da4687493..f7919c545ae 100644 --- a/test/parallel/test-tls-key-mismatch.js +++ b/test/parallel/test-tls-key-mismatch.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var fs = require('fs'); diff --git a/test/parallel/test-tls-max-send-fragment.js b/test/parallel/test-tls-max-send-fragment.js index 3e41cfa45c7..cc9413b81e7 100644 --- a/test/parallel/test-tls-max-send-fragment.js +++ b/test/parallel/test-tls-max-send-fragment.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-multi-key.js b/test/parallel/test-tls-multi-key.js index 76aa97d1ff3..4c9fb4285f6 100644 --- a/test/parallel/test-tls-multi-key.js +++ b/test/parallel/test-tls-multi-key.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var fs = require('fs'); diff --git a/test/parallel/test-tls-no-cert-required.js b/test/parallel/test-tls-no-cert-required.js index 02bbb6b664a..97863606cf2 100644 --- a/test/parallel/test-tls-no-cert-required.js +++ b/test/parallel/test-tls-no-cert-required.js @@ -3,7 +3,7 @@ var common = require('../common'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-no-rsa-key.js b/test/parallel/test-tls-no-rsa-key.js index fd64438ead7..61e8a3b7ca3 100644 --- a/test/parallel/test-tls-no-rsa-key.js +++ b/test/parallel/test-tls-no-rsa-key.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-no-sslv23.js b/test/parallel/test-tls-no-sslv23.js index 931bf5dba05..702019a0bc8 100644 --- a/test/parallel/test-tls-no-sslv23.js +++ b/test/parallel/test-tls-no-sslv23.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js index 4bdf1dfa588..2671bbcad58 100644 --- a/test/parallel/test-tls-no-sslv3.js +++ b/test/parallel/test-tls-no-sslv3.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); @@ -13,7 +13,7 @@ var spawn = require('child_process').spawn; if (common.opensslCli === false) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } var cert = fs.readFileSync(common.fixturesDir + '/test_cert.pem'); diff --git a/test/parallel/test-tls-npn-server-client.js b/test/parallel/test-tls-npn-server-client.js index 5d6022fd648..bdccaaf17e7 100644 --- a/test/parallel/test-tls-npn-server-client.js +++ b/test/parallel/test-tls-npn-server-client.js @@ -11,7 +11,7 @@ var common = require('../common'), if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-ocsp-callback.js b/test/parallel/test-tls-ocsp-callback.js index e61e49d2928..2dbfc6c164b 100644 --- a/test/parallel/test-tls-ocsp-callback.js +++ b/test/parallel/test-tls-ocsp-callback.js @@ -8,12 +8,12 @@ if (!process.features.tls_ocsp) { } if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-on-empty-socket.js b/test/parallel/test-tls-on-empty-socket.js index 8d95a997200..84c95a99db5 100644 --- a/test/parallel/test-tls-on-empty-socket.js +++ b/test/parallel/test-tls-on-empty-socket.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-over-http-tunnel.js b/test/parallel/test-tls-over-http-tunnel.js index cf7ab78685c..cf3ad776f7c 100644 --- a/test/parallel/test-tls-over-http-tunnel.js +++ b/test/parallel/test-tls-over-http-tunnel.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js index ce68fce5f02..05015399553 100644 --- a/test/parallel/test-tls-passphrase.js +++ b/test/parallel/test-tls-passphrase.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-pause.js b/test/parallel/test-tls-pause.js index f9d68f13954..3dc3e53d47f 100644 --- a/test/parallel/test-tls-pause.js +++ b/test/parallel/test-tls-pause.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-peer-certificate-encoding.js b/test/parallel/test-tls-peer-certificate-encoding.js index 533b9126cda..771c8181c8c 100644 --- a/test/parallel/test-tls-peer-certificate-encoding.js +++ b/test/parallel/test-tls-peer-certificate-encoding.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js index fde55af50be..3cfd6420cdf 100644 --- a/test/parallel/test-tls-peer-certificate-multi-keys.js +++ b/test/parallel/test-tls-peer-certificate-multi-keys.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js index 8164154779f..4fa1beb6ac6 100644 --- a/test/parallel/test-tls-peer-certificate.js +++ b/test/parallel/test-tls-peer-certificate.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-request-timeout.js b/test/parallel/test-tls-request-timeout.js index 8915dee1f19..a9b1c78c91a 100644 --- a/test/parallel/test-tls-request-timeout.js +++ b/test/parallel/test-tls-request-timeout.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-securepair-server.js b/test/parallel/test-tls-securepair-server.js index 7ddba939bac..80541620789 100644 --- a/test/parallel/test-tls-securepair-server.js +++ b/test/parallel/test-tls-securepair-server.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-server-verify.js b/test/parallel/test-tls-server-verify.js index 825fdfc9509..cbdf376c7fb 100644 --- a/test/parallel/test-tls-server-verify.js +++ b/test/parallel/test-tls-server-verify.js @@ -3,7 +3,7 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } // This is a rather complex test which sets up various TLS servers with node @@ -101,7 +101,7 @@ var testCases = if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-session-cache.js b/test/parallel/test-tls-session-cache.js index d4a8bdf8d4b..d38fed6a991 100644 --- a/test/parallel/test-tls-session-cache.js +++ b/test/parallel/test-tls-session-cache.js @@ -3,12 +3,12 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } doTest({ tickets: false }, function() { diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js index 2569d4bfd0b..666ef1fa807 100644 --- a/test/parallel/test-tls-set-ciphers.js +++ b/test/parallel/test-tls-set-ciphers.js @@ -3,12 +3,12 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var assert = require('assert'); diff --git a/test/parallel/test-tls-set-encoding.js b/test/parallel/test-tls-set-encoding.js index fa0d72b5ad4..ec728dad0c8 100644 --- a/test/parallel/test-tls-set-encoding.js +++ b/test/parallel/test-tls-set-encoding.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js index 733510a0c45..92c5aadfcbc 100644 --- a/test/parallel/test-tls-sni-option.js +++ b/test/parallel/test-tls-sni-option.js @@ -11,7 +11,7 @@ var common = require('../common'), if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-sni-server-client.js b/test/parallel/test-tls-sni-server-client.js index 7bda717bb78..5a1894cd6e8 100644 --- a/test/parallel/test-tls-sni-server-client.js +++ b/test/parallel/test-tls-sni-server-client.js @@ -11,7 +11,7 @@ var common = require('../common'), if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-ticket-cluster.js b/test/parallel/test-tls-ticket-cluster.js index a9798df0597..fc0f1d5e858 100644 --- a/test/parallel/test-tls-ticket-cluster.js +++ b/test/parallel/test-tls-ticket-cluster.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-ticket.js b/test/parallel/test-tls-ticket.js index 450f6b54a52..6c3ad01fa1c 100644 --- a/test/parallel/test-tls-ticket.js +++ b/test/parallel/test-tls-ticket.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-timeout-server-2.js b/test/parallel/test-tls-timeout-server-2.js index f2dca0b9ab1..29cce0f6af8 100644 --- a/test/parallel/test-tls-timeout-server-2.js +++ b/test/parallel/test-tls-timeout-server-2.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-timeout-server.js b/test/parallel/test-tls-timeout-server.js index 4a9265079bf..ee932c9b1fc 100644 --- a/test/parallel/test-tls-timeout-server.js +++ b/test/parallel/test-tls-timeout-server.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js index af1d8431785..d9e260f99e7 100644 --- a/test/parallel/test-tls-wrap-timeout.js +++ b/test/parallel/test-tls-wrap-timeout.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tls-zero-clear-in.js b/test/parallel/test-tls-zero-clear-in.js index 6eeba925856..33db08a7856 100644 --- a/test/parallel/test-tls-zero-clear-in.js +++ b/test/parallel/test-tls-zero-clear-in.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/parallel/test-tty-wrap.js b/test/parallel/test-tty-wrap.js index 815220865f3..dbe7b6890fd 100644 --- a/test/parallel/test-tty-wrap.js +++ b/test/parallel/test-tty-wrap.js @@ -7,7 +7,7 @@ var isTTY = process.binding('tty_wrap').isTTY; if (isTTY(1) == false) { console.log('1..0 # Skipped: fd 1 is not a tty.'); - process.exit(0); + return; } var handle = new TTY(1); diff --git a/test/parallel/test-zlib-random-byte-pipes.js b/test/parallel/test-zlib-random-byte-pipes.js index 0f34f7ac4f7..4b28b387180 100644 --- a/test/parallel/test-zlib-random-byte-pipes.js +++ b/test/parallel/test-zlib-random-byte-pipes.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/pummel/test-abort-fatal-error.js b/test/pummel/test-abort-fatal-error.js index fb3f0944d74..0d31267a645 100644 --- a/test/pummel/test-abort-fatal-error.js +++ b/test/pummel/test-abort-fatal-error.js @@ -4,7 +4,7 @@ var common = require('../common'); if (process.platform === 'win32') { console.log('1..0 # Skipped: no RLIMIT_NOFILE on Windows'); - process.exit(0); + return; } var exec = require('child_process').exec; diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js index a6270bd2419..1b4f0090e38 100644 --- a/test/pummel/test-dh-regr.js +++ b/test/pummel/test-dh-regr.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var crypto = require('crypto'); diff --git a/test/pummel/test-dtrace-jsstack.js b/test/pummel/test-dtrace-jsstack.js index e21de2153cb..67194a3dd77 100644 --- a/test/pummel/test-dtrace-jsstack.js +++ b/test/pummel/test-dtrace-jsstack.js @@ -6,7 +6,7 @@ var util = require('util'); if (os.type() != 'SunOS') { console.log('1..0 # Skipped: no DTRACE support'); - process.exit(0); + return; } /* diff --git a/test/pummel/test-https-ci-reneg-attack.js b/test/pummel/test-https-ci-reneg-attack.js index 77616b0e275..05622c896e4 100644 --- a/test/pummel/test-https-ci-reneg-attack.js +++ b/test/pummel/test-https-ci-reneg-attack.js @@ -5,7 +5,7 @@ var spawn = require('child_process').spawn; if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var https = require('https'); @@ -14,7 +14,7 @@ var fs = require('fs'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } // renegotiation limits to test diff --git a/test/pummel/test-https-large-response.js b/test/pummel/test-https-large-response.js index 1aa36464a15..4a15b29cd19 100644 --- a/test/pummel/test-https-large-response.js +++ b/test/pummel/test-https-large-response.js @@ -6,7 +6,7 @@ var fs = require('fs'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/pummel/test-https-no-reader.js b/test/pummel/test-https-no-reader.js index 8f407e2d7d4..753687e67a5 100644 --- a/test/pummel/test-https-no-reader.js +++ b/test/pummel/test-https-no-reader.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/pummel/test-keep-alive.js b/test/pummel/test-keep-alive.js index 24d36588204..4d3fbe0731c 100644 --- a/test/pummel/test-keep-alive.js +++ b/test/pummel/test-keep-alive.js @@ -1,7 +1,7 @@ 'use strict'; if (process.platform === 'win32') { console.log('1..0 # Skipped: no `wrk` on windows'); - process.exit(0); + return; } // This test requires the program 'wrk' diff --git a/test/pummel/test-regress-GH-892.js b/test/pummel/test-regress-GH-892.js index d84170d7648..67f9dd95aeb 100644 --- a/test/pummel/test-regress-GH-892.js +++ b/test/pummel/test-regress-GH-892.js @@ -11,7 +11,7 @@ var spawn = require('child_process').spawn; if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/pummel/test-tls-ci-reneg-attack.js b/test/pummel/test-tls-ci-reneg-attack.js index a3c9ba921cb..3fad5e6a4e7 100644 --- a/test/pummel/test-tls-ci-reneg-attack.js +++ b/test/pummel/test-tls-ci-reneg-attack.js @@ -5,7 +5,7 @@ var spawn = require('child_process').spawn; if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); @@ -13,7 +13,7 @@ var fs = require('fs'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } // renegotiation limits to test diff --git a/test/pummel/test-tls-connect-memleak.js b/test/pummel/test-tls-connect-memleak.js index 0345f9a6f62..b8ddc78fab6 100644 --- a/test/pummel/test-tls-connect-memleak.js +++ b/test/pummel/test-tls-connect-memleak.js @@ -6,7 +6,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/pummel/test-tls-securepair-client.js b/test/pummel/test-tls-securepair-client.js index 6d36ae4a367..aaf8e628d6a 100644 --- a/test/pummel/test-tls-securepair-client.js +++ b/test/pummel/test-tls-securepair-client.js @@ -5,12 +5,12 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var join = require('path').join; diff --git a/test/pummel/test-tls-server-large-request.js b/test/pummel/test-tls-server-large-request.js index e6ef89c72eb..d7663e936de 100644 --- a/test/pummel/test-tls-server-large-request.js +++ b/test/pummel/test-tls-server-large-request.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); diff --git a/test/pummel/test-tls-session-timeout.js b/test/pummel/test-tls-session-timeout.js index 0e8abf7bcbc..64548e20434 100644 --- a/test/pummel/test-tls-session-timeout.js +++ b/test/pummel/test-tls-session-timeout.js @@ -3,12 +3,12 @@ var common = require('../common'); if (!common.opensslCli) { console.log('1..0 # Skipped: node compiled without OpenSSL CLI.'); - process.exit(0); + return; } if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } doTest(); diff --git a/test/pummel/test-tls-throttle.js b/test/pummel/test-tls-throttle.js index 3eb1af6da75..67efb61b7e6 100644 --- a/test/pummel/test-tls-throttle.js +++ b/test/pummel/test-tls-throttle.js @@ -7,7 +7,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls'); var fs = require('fs'); diff --git a/test/sequential/test-regress-GH-1531.js b/test/sequential/test-regress-GH-1531.js index 0d06cc34852..097611e1bfb 100644 --- a/test/sequential/test-regress-GH-1531.js +++ b/test/sequential/test-regress-GH-1531.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var https = require('https'); diff --git a/test/sequential/test-setproctitle.js b/test/sequential/test-setproctitle.js index 1c20dc5dd1a..11395f4fdbc 100644 --- a/test/sequential/test-setproctitle.js +++ b/test/sequential/test-setproctitle.js @@ -4,7 +4,7 @@ // FIXME add sunos support if ('linux freebsd darwin'.indexOf(process.platform) === -1) { console.log(`1..0 # Skipped: Unsupported platform [${process.platform}]`); - process.exit(); + return; } var common = require('../common'); diff --git a/test/sequential/test-tls-honorcipherorder.js b/test/sequential/test-tls-honorcipherorder.js index 7e93ac5a059..cac697c5b02 100644 --- a/test/sequential/test-tls-honorcipherorder.js +++ b/test/sequential/test-tls-honorcipherorder.js @@ -4,7 +4,7 @@ var assert = require('assert'); if (!common.hasCrypto) { console.log('1..0 # Skipped: missing crypto'); - process.exit(); + return; } var tls = require('tls');