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.

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

build: add pummel tests to ci runs #34289

Merged
merged 5 commits into from
Apr 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ jobs:
NODE_V8_COVERAGE: ./coverage/tmp
- name: Report
run: npx c8 report
env:
NODE_OPTIONS: --max-old-space-size=8192
- name: Clean tmp
run: npx rimraf ./coverage/tmp
- name: Upload
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ JS_SUITES ?= default
NATIVE_SUITES ?= addons js-native-api node-api
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
CI_JS_SUITES ?= $(JS_SUITES)
CI_JS_SUITES ?= $(JS_SUITES) pummel
ifeq ($(node_use_openssl), false)
CI_DOC := doctool
else
Expand Down
2 changes: 1 addition & 1 deletion test/pummel/test-dh-regr.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const crypto = require('crypto');

// FIPS requires length >= 1024 but we use 256 in this test to keep it from
// taking too long and timing out in CI.
const length = common.hasFipsCrypto ? 1024 : 256;
const length = (common.hasFipsCrypto || common.hasOpenSSL3) ? 1024 : 256;

const p = crypto.createDiffieHellman(length).getPrime();

Expand Down
5 changes: 5 additions & 0 deletions test/pummel/test-hash-seed.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

// 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');

const kRepetitions = 2;
const assert = require('assert');
const fixtures = require('../common/fixtures');
Expand Down
7 changes: 6 additions & 1 deletion test/pummel/test-vm-memleak.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
'use strict';
// Flags: --max_old_space_size=32 --expose_gc

require('../common');
const common = require('../common');

if (process.config.variables.asan) {
common.skip('ASAN messes with memory measurements');
}

const assert = require('assert');
const vm = require('vm');

Expand Down
9 changes: 6 additions & 3 deletions tools/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def RunCommand(self, command, env):
full_command = self.context.processor(command)
output = Execute(full_command,
self.context,
self.context.GetTimeout(self.mode),
self.context.GetTimeout(self.mode, self.config.section),
env,
disable_core_files = self.disable_core_files)
return TestOutput(self,
Expand Down Expand Up @@ -940,8 +940,11 @@ def GetVm(self, arch, mode):

return name

def GetTimeout(self, mode):
return self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]
def GetTimeout(self, mode, section=''):
timeout = self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]
if section == 'pummel':
timeout = timeout * 4
return timeout

def RunTestCases(cases_to_run, progress, tasks, flaky_tests_mode):
progress = PROGRESS_INDICATORS[progress](cases_to_run, flaky_tests_mode)
Expand Down
2 changes: 1 addition & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set JS_SUITES=default
set NATIVE_SUITES=addons js-native-api node-api
@rem CI_* variables should be kept synchronized with the ones in Makefile
set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark"
set "CI_JS_SUITES=%JS_SUITES%"
set "CI_JS_SUITES=%JS_SUITES% pummel"
set CI_DOC=doctool
@rem Same as the test-ci target in Makefile
set "common_test_suites=%JS_SUITES% %NATIVE_SUITES%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
Expand Down