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: remove common.enoughTestCpu #39161

Merged
merged 1 commit into from
Jul 4, 2021
Merged

test: remove common.enoughTestCpu #39161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions test/common/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ On non-Windows platforms, this always returns `true`.

Creates a 10 MB file of all null characters.

### `enoughTestCpu`

* [<boolean>][]

Indicates if there is more than 1 CPU or that the single CPU has a speed of at
least 1 GHz.

### `enoughTestMem`

* [<boolean>][]
Expand Down
5 changes: 0 additions & 5 deletions test/common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,11 +788,6 @@ const common = {
skipIfInspectorDisabled,
skipIfWorker,

get enoughTestCpu() {
const cpus = require('os').cpus();
return Array.isArray(cpus) && (cpus.length > 1 || cpus[0].speed > 999);
},

get enoughTestMem() {
return require('os').totalmem() > 0x70000000; /* 1.75 Gb */
},
Expand Down
2 changes: 0 additions & 2 deletions test/common/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const {
isLinux,
isOSX,
enoughTestMem,
enoughTestCpu,
buildType,
localIPv6Hosts,
opensslCli,
Expand Down Expand Up @@ -64,7 +63,6 @@ export {
isLinux,
isOSX,
enoughTestMem,
enoughTestCpu,
buildType,
localIPv6Hosts,
opensslCli,
Expand Down
4 changes: 0 additions & 4 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,10 +9,6 @@ if (!common.isLinux) {
common.skip('The fs watch limit is OS-dependent');
}

if (!common.enoughTestCpu) {
common.skip('This test is resource-intensive');
}

if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7')) {
common.skip('Too slow for armv6 and armv7 bots');
Expand Down
3 changes: 0 additions & 3 deletions test/tick-processor/test-tick-processor-builtin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');

if (!common.enoughTestCpu)
common.skip('test is CPU-intensive');

if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
Expand Down
3 changes: 0 additions & 3 deletions test/tick-processor/test-tick-processor-cpp-core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');

if (!common.enoughTestCpu)
common.skip('test is CPU-intensive');

if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
Expand Down
3 changes: 0 additions & 3 deletions test/tick-processor/test-tick-processor-polyfill-brokenfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ const { isCPPSymbolsNotMapped } = require('./util');
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();

if (!common.enoughTestCpu)
common.skip('test is CPU-intensive');

if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this OS.');
}
Expand Down
3 changes: 0 additions & 3 deletions test/tick-processor/test-tick-processor-preprocess-flag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
const common = require('../common');
const { isCPPSymbolsNotMapped } = require('./util');

if (!common.enoughTestCpu)
common.skip('test is CPU-intensive');

if (isCPPSymbolsNotMapped) {
common.skip('C++ symbols are not mapped for this os.');
}
Expand Down
3 changes: 0 additions & 3 deletions test/tick-processor/test-tick-processor-unknown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ const common = require('../common');
if (common.isAIX)
common.skip('AIX address range too big for scripts.');

if (!common.enoughTestCpu)
common.skip('test is CPU-intensive');

const base = require('./tick-processor-base.js');

// Unknown checked for to prevent flakiness, if pattern is not found,
Expand Down