Skip to content

Commit

Permalink
test: remove checks for armv6
Browse files Browse the repository at this point in the history
We no longer have armv6 in our regular CI. Remove checks.

PR-URL: #39162
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
Trott authored and targos committed Jul 11, 2021
1 parent d486d01 commit 1f31e3c
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 42 deletions.
3 changes: 0 additions & 3 deletions test/common/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ function platformTimeout(ms) {

const armv = process.config.variables.arm_version;

if (armv === '6')
return multipliers.seven * ms; // ARMv6

if (armv === '7')
return multipliers.two * ms; // ARMv7

Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-hash-modp18.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-keys.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ if (!common.hasCrypto) {
common.skip('node compiled without OpenSSL.');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-dh-regr.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ if (!common.hasCrypto) {
common.skip('missing crypto');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-fs-watch-system-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ if (!common.isLinux) {
common.skip('The fs watch limit is OS-dependent');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

try {
Expand Down
6 changes: 3 additions & 3 deletions test/pummel/test-hash-seed.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// Check that spawn child doesn't create duplicated entries
const common = require('../common');

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7'))
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const kRepetitions = 2;
const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

const common = require('../common');

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const tmpdir = require('../common/tmpdir');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-heapsnapshot-near-heap-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

const common = require('../common');

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const tmpdir = require('../common/tmpdir');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ if (process.config.variables.asan) {
common.skip('ASAN messes with memory measurements');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-next-tick-infinite-calls.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
'use strict';
const common = require('../common');

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

let complete = 0;
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-policy-integrity.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ if (!common.hasCrypto) {
common.skip('missing crypto');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

common.requireNoPackageJSONAbove();
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-webcrypto-derivebits-pbkdf2.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ if (!common.hasCrypto) {
common.skip('missing crypto');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
Expand Down
6 changes: 3 additions & 3 deletions test/sequential/test-child-process-pass-fd.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const common = require('../common');
// This test is basically `test-cluster-net-send` but creating lots of workers
// so the issue reproduces on OS X consistently.

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7'))
common.skip('Too slow for armv6 and armv7 bots');
if (process.config.variables.arm_version === '7') {
common.skip('Too slow for armv7 bots');
}

const assert = require('assert');
const { fork } = require('child_process');
Expand Down

0 comments on commit 1f31e3c

Please sign in to comment.