Skip to content

Commit b7042f9

Browse files
Trottejose19
Trott
authored and
ejose19
committed
test: remove checks for armv6
We no longer have armv6 in our regular CI. Remove checks. PR-URL: nodejs#39162 Reviewed-By: Luigi Pinca <[email protected]>
1 parent 67cf682 commit b7042f9

14 files changed

+28
-42
lines changed

Diff for: ‎test/common/index.js

-3
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,6 @@ function platformTimeout(ms) {
252252

253253
const armv = process.config.variables.arm_version;
254254

255-
if (armv === '6')
256-
return multipliers.seven * ms; // ARMv6
257-
258255
if (armv === '7')
259256
return multipliers.two * ms; // ARMv7
260257

Diff for: ‎test/pummel/test-crypto-dh-hash-modp18.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ if (!common.hasCrypto) {
2626
common.skip('node compiled without OpenSSL.');
2727
}
2828

29-
if ((process.config.variables.arm_version === '6') ||
30-
(process.config.variables.arm_version === '7')) {
31-
common.skip('Too slow for armv6 and armv7 bots');
29+
if (process.config.variables.arm_version === '7') {
30+
common.skip('Too slow for armv7 bots');
3231
}
3332

3433
const assert = require('assert');

Diff for: ‎test/pummel/test-crypto-dh-hash.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ if (!common.hasCrypto) {
2626
common.skip('node compiled without OpenSSL.');
2727
}
2828

29-
if ((process.config.variables.arm_version === '6') ||
30-
(process.config.variables.arm_version === '7')) {
31-
common.skip('Too slow for armv6 and armv7 bots');
29+
if (process.config.variables.arm_version === '7') {
30+
common.skip('Too slow for armv7 bots');
3231
}
3332

3433
const assert = require('assert');

Diff for: ‎test/pummel/test-crypto-dh-keys.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ if (!common.hasCrypto) {
2626
common.skip('node compiled without OpenSSL.');
2727
}
2828

29-
if ((process.config.variables.arm_version === '6') ||
30-
(process.config.variables.arm_version === '7')) {
31-
common.skip('Too slow for armv6 and armv7 bots');
29+
if (process.config.variables.arm_version === '7') {
30+
common.skip('Too slow for armv7 bots');
3231
}
3332

3433
const assert = require('assert');

Diff for: ‎test/pummel/test-dh-regr.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ if (!common.hasCrypto) {
2626
common.skip('missing crypto');
2727
}
2828

29-
if ((process.config.variables.arm_version === '6') ||
30-
(process.config.variables.arm_version === '7')) {
31-
common.skip('Too slow for armv6 and armv7 bots');
29+
if (process.config.variables.arm_version === '7') {
30+
common.skip('Too slow for armv7 bots');
3231
}
3332

3433
const assert = require('assert');

Diff for: ‎test/pummel/test-fs-watch-system-limit.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ if (!common.isLinux) {
99
common.skip('The fs watch limit is OS-dependent');
1010
}
1111

12-
if ((process.config.variables.arm_version === '6') ||
13-
(process.config.variables.arm_version === '7')) {
14-
common.skip('Too slow for armv6 and armv7 bots');
12+
if (process.config.variables.arm_version === '7') {
13+
common.skip('Too slow for armv7 bots');
1514
}
1615

1716
try {

Diff for: ‎test/pummel/test-hash-seed.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// Check that spawn child doesn't create duplicated entries
44
const common = require('../common');
55

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

1010
const kRepetitions = 2;
1111
const assert = require('assert');

Diff for: ‎test/pummel/test-heapsnapshot-near-heap-limit-bounded.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

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

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

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

Diff for: ‎test/pummel/test-heapsnapshot-near-heap-limit.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

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

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

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

Diff for: ‎test/pummel/test-net-bytes-per-incoming-chunk-overhead.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ if (process.config.variables.asan) {
77
common.skip('ASAN messes with memory measurements');
88
}
99

10-
if ((process.config.variables.arm_version === '6') ||
11-
(process.config.variables.arm_version === '7')) {
12-
common.skip('Too slow for armv6 and armv7 bots');
10+
if (process.config.variables.arm_version === '7') {
11+
common.skip('Too slow for armv7 bots');
1312
}
1413

1514
const assert = require('assert');

Diff for: ‎test/pummel/test-next-tick-infinite-calls.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
'use strict';
2323
const common = require('../common');
2424

25-
if ((process.config.variables.arm_version === '6') ||
26-
(process.config.variables.arm_version === '7')) {
27-
common.skip('Too slow for armv6 and armv7 bots');
25+
if (process.config.variables.arm_version === '7') {
26+
common.skip('Too slow for armv7 bots');
2827
}
2928

3029
let complete = 0;

Diff for: ‎test/pummel/test-policy-integrity.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
}
88

9-
if ((process.config.variables.arm_version === '6') ||
10-
(process.config.variables.arm_version === '7')) {
11-
common.skip('Too slow for armv6 and armv7 bots');
9+
if (process.config.variables.arm_version === '7') {
10+
common.skip('Too slow for armv7 bots');
1211
}
1312

1413
common.requireNoPackageJSONAbove();

Diff for: ‎test/pummel/test-webcrypto-derivebits-pbkdf2.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
}
88

9-
if ((process.config.variables.arm_version === '6') ||
10-
(process.config.variables.arm_version === '7')) {
11-
common.skip('Too slow for armv6 and armv7 bots');
9+
if (process.config.variables.arm_version === '7') {
10+
common.skip('Too slow for armv7 bots');
1211
}
1312

1413
const assert = require('assert');

Diff for: ‎test/sequential/test-child-process-pass-fd.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ const common = require('../common');
99
// This test is basically `test-cluster-net-send` but creating lots of workers
1010
// so the issue reproduces on OS X consistently.
1111

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

1616
const assert = require('assert');
1717
const { fork } = require('child_process');

0 commit comments

Comments
 (0)