Skip to content

Add test runner option --log-test-environment #25843

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 7 commits into from
Nov 21, 2025
+104 −4
Merged

Add test runner option --log-test-environment #25843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cce3a70
Add test runner option --log-test-environment, which will introspect …
juj Nov 20, 2025
c6fdc54
ruff
juj Nov 20, 2025
ec96ead
ruffer
juj Nov 20, 2025
fc9533f
review
juj Nov 21, 2025
a9a6fff
review
juj Nov 21, 2025
0352e79
ruff
juj Nov 21, 2025
54ae64c
short git log
juj Nov 21, 2025
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
39 changes: 20 additions & 19 deletions test/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
from common import errlog
from single_line_runner import SingleLineTestRunner

from tools import colored_logger, config, shared, utils
from tools import building, colored_logger, config, shared, utils

logger = logging.getLogger("runner")

Expand Down Expand Up @@ -568,10 +568,9 @@ def cleanup_emscripten_temp():


def print_repository_info(directory, repository_name):
import subprocess
current_commit = subprocess.run(['git', 'log', '-n1'], cwd=directory, stdout=subprocess.PIPE, text=True).stdout.strip()
current_commit = utils.run_process(['git', 'show', '--no-patch'], cwd=directory, stdout=subprocess.PIPE, text=True).stdout.strip()
print(f'\n{repository_name} {current_commit}\n')
local_changes = subprocess.run(['git', 'diff'], cwd=directory, stdout=subprocess.PIPE, text=True).stdout.strip()
local_changes = utils.run_process(['git', 'diff'], cwd=directory, stdout=subprocess.PIPE, text=True).stdout.strip()
if local_changes:
print(f'\n{local_changes}\n')

Expand All @@ -584,25 +583,25 @@ def log_test_environment():
print(f'Python: "{sys.executable}". Version: {sys.version}')
print(f'Emscripten test runner path: "{os.path.realpath(__file__)}"')

if os.path.isdir(os.path.join(config.EMSCRIPTEN_ROOT, '.git')):
print(f'\nEmscripten repository: "{config.EMSCRIPTEN_ROOT}"')
if os.path.isdir(os.path.join(__rootpath__, '.git')):
print(f'\nEmscripten repository: "{__rootpath__}"')

emscripten_version = os.path.realpath(os.path.join(config.EMSCRIPTEN_ROOT, 'emscripten-version.txt'))
emscripten_version = utils.path_from_root('emscripten-version.txt')
if os.path.isfile(emscripten_version):
print(f'emscripten-version.txt: {utils.read_file(emscripten_version).strip()}')
print(f'emscripten-version.txt: {utils.EMSCRIPTEN_VERSION}')

if os.path.isdir(os.path.join(config.EMSCRIPTEN_ROOT, '.git')):
print_repository_info(config.EMSCRIPTEN_ROOT, 'Emscripten')
if os.path.isdir(os.path.join(__rootpath__, '.git')):
print_repository_info(__rootpath__, 'Emscripten')

print(f'EM_CONFIG: "{config.EM_CONFIG}"')
if os.path.isfile(config.EM_CONFIG):
print(f'\n{utils.read_file(config.EM_CONFIG).strip()}\n')

node_js_version = subprocess.run(config.NODE_JS + ['--version'], stdout=subprocess.PIPE, text=True).stdout.strip()
node_js_version = utils.run_process(config.NODE_JS + ['--version'], stdout=subprocess.PIPE, text=True).stdout.strip()
print(f'NODE_JS: {config.NODE_JS}. Version: {node_js_version}')
Copy link
Collaborator

@sbc100 sbc100 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have this available via utils.get_node_version()

Copy link
Collaborator Author

@juj juj Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's shared.get_node_version(), but that parses the output. I think it's better in this case to output the raw version string as emitted by NODE_JS --version.


print(f'BINARYEN_ROOT: {config.BINARYEN_ROOT}')
wasm_opt_version = subprocess.run([os.path.join(config.BINARYEN_ROOT, 'bin', 'wasm-opt.exe'), '--version'], stdout=subprocess.PIPE, text=True).stdout.strip()
wasm_opt_version = building.get_binaryen_version(building.get_binaryen_bin()).strip()
print(f'wasm-opt version: {wasm_opt_version}')

binaryen_git_dir = config.BINARYEN_ROOT
Expand Down Expand Up @@ -631,20 +630,22 @@ def find_llvm_git_root(dir):
print(f'LLVM git directory: "{llvm_git_root}"')
print_repository_info(llvm_git_root, 'LLVM')

clang_version = subprocess.run([shared.CLANG_CC, '--version'], stdout=subprocess.PIPE, text=True).stdout.strip()
clang_version = utils.run_process([shared.CLANG_CC, '--version'], stdout=subprocess.PIPE, text=True).stdout.strip()
print(f'Clang: "{shared.CLANG_CC}"\n{clang_version}\n')
Copy link
Collaborator

@sbc100 sbc100 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have shared.get_clang_version() for this.

Copy link
Collaborator Author

@juj juj Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That too parses the output - it would be preferable to print the raw output here.


print(f'EMTEST_BROWSER: {browser_common.EMTEST_BROWSER}')
firefox_version = browser_common.get_firefox_version()
if firefox_version != 2**31 - 1:
print(f'Firefox version: {firefox_version}')
if browser_common.is_firefox():
print(f'Firefox version: {browser_common.get_firefox_version()}')
else:
print('Not detected as a Firefox browser')
safari_version = browser_common.get_safari_version()
if safari_version != 2**31 - 1:
print(f'Safari version: {safari_version}')
if browser_common.is_safari():
print(f'Safari version: {browser_common.get_safari_version()}')
else:
print('Not detected as a Safari browser')
if browser_common.is_chrome():
print(f'Browser is Chrome.')
else:
print('Not detected as a Chrome browser')

emsdk_dir = os.getenv('EMSDK')
print(f'\nEMSDK: "{emsdk_dir}"')
Expand Down
8 changes: 6 additions & 2 deletions tools/building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,14 +1189,18 @@ def get_binaryen_feature_flags():
return ['--detect-features']


def check_binaryen(bindir):
def get_binaryen_version(bindir):
opt = os.path.join(bindir, utils.exe_suffix('wasm-opt'))
if not os.path.exists(opt):
exit_with_error('binaryen executable not found (%s). Please check your binaryen installation' % opt)
try:
output = run_process([opt, '--version'], stdout=PIPE).stdout
return run_process([opt, '--version'], stdout=PIPE).stdout
except subprocess.CalledProcessError:
exit_with_error('error running binaryen executable (%s). Please check your binaryen installation' % opt)


def check_binaryen(bindir):
output = get_binaryen_version(bindir)
if output:
output = output.splitlines()[0]
try:
Expand Down