test: only skip slow tests on Raspberry Pi devices

richardlau · juanarbol · commit 8a19abcb0b7e · 2022-05-30T21:34:14.000-05:00
Detect the Raspberry Pi devices in the Node.js CI and only skip the slow tests on those instead of all armv7l devices. PR-URL: #42645 Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Stewart X Addison <sxa@redhat.com> Reviewed-By: Darshan Sen <raisinten@gmail.com>
diff --git a/test/common/index.js b/test/common/index.js
@@ -120,6 +120,17 @@ const isFreeBSD = process.platform === 'freebsd';
 const isOpenBSD = process.platform === 'openbsd';
 const isLinux = process.platform === 'linux';
 const isOSX = process.platform === 'darwin';
+const isPi = (() => {
+  try {
+    // Normal Raspberry Pi detection is to find the `Raspberry Pi` string in
+    // the contents of `/sys/firmware/devicetree/base/model` but that doesn't
+    // work inside a container. Match the chipset model number instead.
+    const cpuinfo = fs.readFileSync('/proc/cpuinfo', { encoding: 'utf8' });
+    return /^Hardware\s*:\s*(.*)$/im.exec(cpuinfo)?.[1] === 'BCM2835';
+  } catch {
+    return false;
+  }
+})();
 
 const isDumbTerminal = process.env.TERM === 'dumb';
 
@@ -246,15 +257,10 @@ function platformTimeout(ms) {
   if (isAIX)
     return multipliers.two * ms; // Default localhost speed is slower on AIX
 
-  if (process.arch !== 'arm')
-    return ms;
-
-  const armv = process.config.variables.arm_version;
-
-  if (armv === '7')
-    return multipliers.two * ms;  // ARMv7
+  if (isPi)
+    return multipliers.two * ms;  // Raspberry Pi devices
 
-  return ms; // ARMv8+
+  return ms;
 }
 
 let knownGlobals = [
@@ -790,6 +796,7 @@ const common = {
   isMainThread,
   isOpenBSD,
   isOSX,
+  isPi,
   isSunOS,
   isWindows,
   localIPv6Hosts,
diff --git a/test/pummel/test-crypto-dh-hash-modp18.js b/test/pummel/test-crypto-dh-hash-modp18.js
@@ -26,8 +26,8 @@ if (!common.hasCrypto) {
   common.skip('node compiled without OpenSSL.');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 const assert = require('assert');
diff --git a/test/pummel/test-crypto-dh-hash.js b/test/pummel/test-crypto-dh-hash.js
@@ -26,8 +26,8 @@ if (!common.hasCrypto) {
   common.skip('node compiled without OpenSSL.');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 const assert = require('assert');
diff --git a/test/pummel/test-crypto-dh-keys.js b/test/pummel/test-crypto-dh-keys.js
@@ -26,8 +26,8 @@ if (!common.hasCrypto) {
   common.skip('node compiled without OpenSSL.');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 const assert = require('assert');
diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js
@@ -26,8 +26,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 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,8 +9,8 @@ if (!common.isLinux) {
   common.skip('The fs watch limit is OS-dependent');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 try {
diff --git a/test/pummel/test-hash-seed.js b/test/pummel/test-hash-seed.js
@@ -3,8 +3,8 @@
 // Check that spawn child doesn't create duplicated entries
 const common = require('../common');
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 const kRepetitions = 2;
diff --git a/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js b/test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
@@ -2,8 +2,8 @@
 
 const common = require('../common');
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 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,8 +2,8 @@
 
 const common = require('../common');
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 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,8 +7,8 @@ if (process.config.variables.asan) {
   common.skip('ASAN messes with memory measurements');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 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,8 +22,8 @@
 'use strict';
 const common = require('../common');
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 let complete = 0;
diff --git a/test/pummel/test-policy-integrity-dep.js b/test/pummel/test-policy-integrity-dep.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-parent-commonjs.js b/test/pummel/test-policy-integrity-parent-commonjs.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-parent-module.js b/test/pummel/test-policy-integrity-parent-module.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-parent-no-package-json.js b/test/pummel/test-policy-integrity-parent-no-package-json.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-worker-commonjs.js b/test/pummel/test-policy-integrity-worker-commonjs.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-worker-module.js b/test/pummel/test-policy-integrity-worker-module.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-policy-integrity-worker-no-package-json.js b/test/pummel/test-policy-integrity-worker-no-package-json.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 common.requireNoPackageJSONAbove();
diff --git a/test/pummel/test-repl-empty-maybelocal-crash.js b/test/pummel/test-repl-empty-maybelocal-crash.js
@@ -1,8 +1,8 @@
 'use strict';
 const common = require('../common');
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 // The process should not crash when the REPL receives the string, 'ss'.
diff --git a/test/pummel/test-webcrypto-derivebits-pbkdf2.js b/test/pummel/test-webcrypto-derivebits-pbkdf2.js
@@ -6,8 +6,8 @@ if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
-if (process.config.variables.arm_version === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 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,8 +9,8 @@ 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 === '7') {
-  common.skip('Too slow for armv7 bots');
+if (common.isPi) {
+  common.skip('Too slow for Raspberry Pi devices');
 }
 
 const assert = require('assert');

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ if (!common.hasCrypto) {`
`26`	`26`	`common.skip('node compiled without OpenSSL.');`
`27`	`27`	`}`
`28`	`28`
`29`		`-if (process.config.variables.arm_version === '7') {`
`30`		`- common.skip('Too slow for armv7 bots');`
	`29`	`+if (common.isPi) {`
	`30`	`+ common.skip('Too slow for Raspberry Pi devices');`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`const assert = require('assert');`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +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 === '7') {`
`13`		`- common.skip('Too slow for armv7 bots');`
	`12`	`+if (common.isPi) {`
	`13`	`+ common.skip('Too slow for Raspberry Pi devices');`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`// Check that spawn child doesn't create duplicated entries`
`4`	`4`	`const common = require('../common');`
`5`	`5`
`6`		`-if (process.config.variables.arm_version === '7') {`
`7`		`- common.skip('Too slow for armv7 bots');`
	`6`	`+if (common.isPi) {`
	`7`	`+ common.skip('Too slow for Raspberry Pi devices');`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`const kRepetitions = 2;`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`const common = require('../common');`
`4`	`4`
`5`		`-if (process.config.variables.arm_version === '7') {`
`6`		`- common.skip('Too slow for armv7 bots');`
	`5`	`+if (common.isPi) {`
	`6`	`+ common.skip('Too slow for Raspberry Pi devices');`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`const tmpdir = require('../common/tmpdir');`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +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 === '7') {`
`11`		`- common.skip('Too slow for armv7 bots');`
	`10`	`+if (common.isPi) {`
	`11`	`+ common.skip('Too slow for Raspberry Pi devices');`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`const assert = require('assert');`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`'use strict';`
`23`	`23`	`const common = require('../common');`
`24`	`24`
`25`		`-if (process.config.variables.arm_version === '7') {`
`26`		`- common.skip('Too slow for armv7 bots');`
	`25`	`+if (common.isPi) {`
	`26`	`+ common.skip('Too slow for Raspberry Pi devices');`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`let complete = 0;`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ if (!common.hasCrypto) {`
`6`	`6`	`common.skip('missing crypto');`
`7`	`7`	`}`
`8`	`8`
`9`		`-if (process.config.variables.arm_version === '7') {`
`10`		`- common.skip('Too slow for armv7 bots');`
	`9`	`+if (common.isPi) {`
	`10`	`+ common.skip('Too slow for Raspberry Pi devices');`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`common.requireNoPackageJSONAbove();`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`'use strict';`
`2`	`2`	`const common = require('../common');`
`3`	`3`
`4`		`-if (process.config.variables.arm_version === '7') {`
`5`		`- common.skip('Too slow for armv7 bots');`
	`4`	`+if (common.isPi) {`
	`5`	`+ common.skip('Too slow for Raspberry Pi devices');`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`// The process should not crash when the REPL receives the string, 'ss'.`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ const common = require('../common');`
`9`	`9`	// This test is basically `test-cluster-net-send` but creating lots of workers
`10`	`10`	`// so the issue reproduces on OS X consistently.`
`11`	`11`
`12`		`-if (process.config.variables.arm_version === '7') {`
`13`		`- common.skip('Too slow for armv7 bots');`
	`12`	`+if (common.isPi) {`
	`13`	`+ common.skip('Too slow for Raspberry Pi devices');`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`const assert = require('assert');`