Skip to content

Commit

Permalink
test: remove common.enoughTestCpu
Browse files Browse the repository at this point in the history
All hosts in CI return true for common.enoughTestCpu. At least for our
CI, it is always true, so we can remove it.

PR-URL: #39161
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
Trott committed Jul 4, 2021
1 parent 7868062 commit 32b6f4b
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 33 deletions.
7 changes: 0 additions & 7 deletions test/common/README.md
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`

* [&lt;boolean>][]

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

### `enoughTestMem`

* [&lt;boolean>][]
Expand Down
5 changes: 0 additions & 5 deletions test/common/index.js
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
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
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
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
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
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
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
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

0 comments on commit 32b6f4b

Please sign in to comment.