Skip to content

[test] Extract try_require_node_version helper function. NFC #24463

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

Merged
merged 1 commit into from
Jun 2, 2025
Merged

[test] Extract try_require_node_version helper function. NFC #24463

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
35 changes: 17 additions & 18 deletions test/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,12 +1038,8 @@ def require_wasm64(self):
if self.is_browser_test():
return

nodejs = self.get_nodejs()
if nodejs:
version = shared.get_node_version(nodejs)
if version >= (24, 0, 0):
self.js_engines = [nodejs]
return
if self.try_require_node_version(24):
return

if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
self.emcc_args.append('-sENVIRONMENT=shell')
Expand All @@ -1055,16 +1051,23 @@ def require_wasm64(self):
else:
self.fail('either d8 or node >= 24 required to run wasm64 tests. Use EMTEST_SKIP_WASM64 to skip')

def try_require_node_version(self, major, minor = 0, revision = 0):
nodejs = self.get_nodejs()
if not nodejs:
self.skipTest('Test requires nodejs to run')
version = shared.get_node_version(nodejs)
if version < (major, minor, revision):
return False

self.js_engines = [nodejs]
return True

def require_simd(self):
if self.is_browser_test():
return

nodejs = self.get_nodejs()
if nodejs:
version = shared.get_node_version(nodejs)
if version >= (16, 0, 0):
self.js_engines = [nodejs]
return
if self.try_require_node_version(16):
return

if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
self.emcc_args.append('-sENVIRONMENT=shell')
Expand All @@ -1078,12 +1081,8 @@ def require_simd(self):

def require_wasm_legacy_eh(self):
self.set_setting('WASM_LEGACY_EXCEPTIONS')
nodejs = self.get_nodejs()
if nodejs:
version = shared.get_node_version(nodejs)
if version >= (17, 0, 0):
self.js_engines = [nodejs]
return
if self.try_require_node_version(17):
return

if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
self.emcc_args.append('-sENVIRONMENT=shell')
Expand Down