From 296b969e0a6255a4dcfa6d138060d1864c403cd0 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 24 Apr 2021 21:13:48 -0700 Subject: [PATCH] test: skip some pummel tests on slower machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skipped the longest-running pummel tests on the Raspberry Pi devices in CI. Refs: https://github.com/nodejs/node/pull/34289#issuecomment-823354459 PR-URL: https://github.com/nodejs/node/pull/38394 Reviewed-By: Michaël Zasso Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Filip Skokan --- test/pummel/test-crypto-dh-hash-modp18.js | 9 ++++++++- test/pummel/test-crypto-dh-hash.js | 9 ++++++++- test/pummel/test-crypto-dh-keys.js | 1 + test/pummel/test-dh-regr.js | 9 ++++++++- test/pummel/test-next-tick-infinite-calls.js | 7 ++++++- test/pummel/test-policy-integrity.js | 11 ++++++++++- 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/test/pummel/test-crypto-dh-hash-modp18.js b/test/pummel/test-crypto-dh-hash-modp18.js index 288a647bdd321d..06121d1f6dc956 100644 --- a/test/pummel/test-crypto-dh-hash-modp18.js +++ b/test/pummel/test-crypto-dh-hash-modp18.js @@ -21,8 +21,15 @@ 'use strict'; const common = require('../common'); -if (!common.hasCrypto) + +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'); +} const assert = require('assert'); const crypto = require('crypto'); diff --git a/test/pummel/test-crypto-dh-hash.js b/test/pummel/test-crypto-dh-hash.js index 7188fbb32b9197..5b7002ce7fe16b 100644 --- a/test/pummel/test-crypto-dh-hash.js +++ b/test/pummel/test-crypto-dh-hash.js @@ -21,8 +21,15 @@ 'use strict'; const common = require('../common'); -if (!common.hasCrypto) + +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'); +} const assert = require('assert'); const crypto = require('crypto'); diff --git a/test/pummel/test-crypto-dh-keys.js b/test/pummel/test-crypto-dh-keys.js index 37095135f85174..33c2ed86073045 100644 --- a/test/pummel/test-crypto-dh-keys.js +++ b/test/pummel/test-crypto-dh-keys.js @@ -21,6 +21,7 @@ 'use strict'; const common = require('../common'); + if (!common.hasCrypto) { common.skip('node compiled without OpenSSL.'); } diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js index f2da464bbbfbd7..dcdaa693853352 100644 --- a/test/pummel/test-dh-regr.js +++ b/test/pummel/test-dh-regr.js @@ -21,8 +21,15 @@ 'use strict'; const common = require('../common'); -if (!common.hasCrypto) + +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'); +} const assert = require('assert'); const crypto = require('crypto'); diff --git a/test/pummel/test-next-tick-infinite-calls.js b/test/pummel/test-next-tick-infinite-calls.js index 5ee44076dcc2f3..7ae3b2261358af 100644 --- a/test/pummel/test-next-tick-infinite-calls.js +++ b/test/pummel/test-next-tick-infinite-calls.js @@ -20,7 +20,12 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +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'); +} let complete = 0; diff --git a/test/pummel/test-policy-integrity.js b/test/pummel/test-policy-integrity.js index c29bb7a7b3f90e..9383f881fbe514 100644 --- a/test/pummel/test-policy-integrity.js +++ b/test/pummel/test-policy-integrity.js @@ -1,7 +1,16 @@ 'use strict'; const common = require('../common'); -if (!common.hasCrypto) common.skip('missing crypto'); + +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'); +} + common.requireNoPackageJSONAbove(); const { debuglog } = require('util');