summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/common/index.js3
-rw-r--r--test/pummel/test-crypto-dh-hash-modp18.js5
-rw-r--r--test/pummel/test-crypto-dh-hash.js5
-rw-r--r--test/pummel/test-crypto-dh-keys.js5
-rw-r--r--test/pummel/test-dh-regr.js5
-rw-r--r--test/pummel/test-fs-watch-system-limit.js5
-rw-r--r--test/pummel/test-hash-seed.js6
-rw-r--r--test/pummel/test-heapsnapshot-near-heap-limit-bounded.js5
-rw-r--r--test/pummel/test-heapsnapshot-near-heap-limit.js5
-rw-r--r--test/pummel/test-net-bytes-per-incoming-chunk-overhead.js5
-rw-r--r--test/pummel/test-next-tick-infinite-calls.js5
-rw-r--r--test/pummel/test-policy-integrity.js5
-rw-r--r--test/pummel/test-webcrypto-derivebits-pbkdf2.js5
-rw-r--r--test/sequential/test-child-process-pass-fd.js6
14 files changed, 28 insertions, 42 deletions
diff --git a/test/common/index.js b/test/common/index.js
index 1ffe7b4804..df61b3c3cd 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -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
diff --git a/test/pummel/test-crypto-dh-hash-modp18.js b/test/pummel/test-crypto-dh-hash-modp18.js
index 06121d1f6d..e2a7f43c45 100644
--- a/test/pummel/test-crypto-dh-hash-modp18.js
+++ b/test/pummel/test-crypto-dh-hash-modp18.js
@@ -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');
diff --git a/test/pummel/test-crypto-dh-hash.js b/test/pummel/test-crypto-dh-hash.js
index 5b7002ce7f..a5932eb764 100644
--- a/test/pummel/test-crypto-dh-hash.js
+++ b/test/pummel/test-crypto-dh-hash.js
@@ -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');
diff --git a/test/pummel/test-crypto-dh-keys.js b/test/pummel/test-crypto-dh-keys.js
index 33c2ed8607..99be0e517f 100644
--- a/test/pummel/test-crypto-dh-keys.js
+++ b/test/pummel/test-crypto-dh-keys.js
@@ -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');
diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js
index fff20c3ed0..c55b7ff54d 100644
--- a/test/pummel/test-dh-regr.js
+++ b/test/pummel/test-dh-regr.js
@@ -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');
diff --git a/test/pummel/test-fs-watch-system-limit.js b/test/pummel/test-fs-watch-system-limit.js
index 9c378bec6d..20995c514f 100644
--- a/test/pummel/test-fs-watch-system-limit.js
+++ b/test/pummel/test-fs-watch-system-limit.js
@@ -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 {
diff --git a/test/pummel/test-hash-seed.js b/test/pummel/test-hash-seed.js
index d63754cb56..42b626b079 100644
--- a/test/pummel/test-hash-seed.js
+++ b/test/pummel/test-hash-seed.js
@@ -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');
diff --git a/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
index 0ad6a898d1..faf5c4755a 100644
--- a/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
+++ b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
@@ -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');
diff --git a/test/pummel/test-heapsnapshot-near-heap-limit.js b/test/pummel/test-heapsnapshot-near-heap-limit.js
index 6651f2ae9f..420ba04205 100644
--- a/test/pummel/test-heapsnapshot-near-heap-limit.js
+++ b/test/pummel/test-heapsnapshot-near-heap-limit.js
@@ -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');
diff --git a/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
index fed903c263..f556e9881f 100644
--- a/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
+++ b/test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
@@ -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');
diff --git a/test/pummel/test-next-tick-infinite-calls.js b/test/pummel/test-next-tick-infinite-calls.js
index 7ae3b22613..bf837f5ebc 100644
--- a/test/pummel/test-next-tick-infinite-calls.js
+++ b/test/pummel/test-next-tick-infinite-calls.js
@@ -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;
diff --git a/test/pummel/test-policy-integrity.js b/test/pummel/test-policy-integrity.js
index 9383f881fb..1626a4a415 100644
--- a/test/pummel/test-policy-integrity.js
+++ b/test/pummel/test-policy-integrity.js
@@ -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();
diff --git a/test/pummel/test-webcrypto-derivebits-pbkdf2.js b/test/pummel/test-webcrypto-derivebits-pbkdf2.js
index 745071f345..512662025c 100644
--- a/test/pummel/test-webcrypto-derivebits-pbkdf2.js
+++ b/test/pummel/test-webcrypto-derivebits-pbkdf2.js
@@ -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');
diff --git a/test/sequential/test-child-process-pass-fd.js b/test/sequential/test-child-process-pass-fd.js
index 98832c57a3..ad4e5d693e 100644
--- a/test/sequential/test-child-process-pass-fd.js
+++ b/test/sequential/test-child-process-pass-fd.js
@@ -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');
View Lorry Controller Status