test: remove checks for armv6

Trott · targos · commit 1f31e3c774ff · 2021-07-11T09:46:21.000+02:00
We no longer have armv6 in our regular CI. Remove checks. PR-URL: #39162 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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');

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,8 @@ if (!common.hasCrypto) {`
`26`	`26`	`common.skip('node compiled without OpenSSL.');`
`27`	`27`	`}`
`28`	`28`
`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');`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`const assert = require('assert');`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@ if (!common.isLinux) {`
`9`	`9`	`common.skip('The fs watch limit is OS-dependent');`
`10`	`10`	`}`
`11`	`11`
`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');`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@`
`2`	`2`
`3`	`3`	`const common = require('../common');`
`4`	`4`
`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');`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`const tmpdir = require('../common/tmpdir');`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@ if (process.config.variables.asan) {`
`7`	`7`	`common.skip('ASAN messes with memory measurements');`
`8`	`8`	`}`
`9`	`9`
`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');`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`const assert = require('assert');`