Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test,tools: remove armv6 from test tools and checks #39162

Merged
merged 2 commits into from
Jul 5, 2021
Merged

test,tools: remove armv6 from test tools and checks #39162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6232126
test: remove checks for armv6
Trott Jun 26, 2021
8703d22
tools: remove armv6 from test tools
Trott Jun 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions test/common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-hash-modp18.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-hash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-crypto-dh-keys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-dh-regr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-fs-watch-system-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions test/pummel/test-hash-seed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-heapsnapshot-near-heap-limit-bounded.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-heapsnapshot-near-heap-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-net-bytes-per-incoming-chunk-overhead.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-next-tick-infinite-calls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-policy-integrity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 2 additions & 3 deletions test/pummel/test-webcrypto-derivebits-pbkdf2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 3 additions & 3 deletions test/sequential/test-child-process-pass-fd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 1 addition & 2 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,7 @@ def GetTestStatus(self, context, sections, defs):


TIMEOUT_SCALEFACTOR = {
'armv6' : { 'debug' : 12, 'release' : 3 }, # The ARM buildbots are slow.
'arm' : { 'debug' : 8, 'release' : 2 },
'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow.
'ia32' : { 'debug' : 4, 'release' : 1 },
'ppc' : { 'debug' : 4, 'release' : 1 },
's390' : { 'debug' : 4, 'release' : 1 } }
Expand Down
4 changes: 1 addition & 3 deletions tools/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ def GuessOS():
def GuessArchitecture():
id = platform.machine()
id = id.lower() # Windows 7 capitalizes 'AMD64'.
if id.startswith('armv6'): # Can return 'armv6l'.
return 'armv6'
elif id.startswith('arm') or id == 'aarch64':
if id.startswith('arm') or id == 'aarch64':
return 'arm'
elif (not id) or (not re.match('(x|i[3-6])86$', id) is None):
return 'ia32'
Expand Down