Skip to content

Fix ClangBuilder for running LNT on Windows #575

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
Aug 29, 2025
Merged

Fix ClangBuilder for running LNT on Windows #575

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
19 changes: 10 additions & 9 deletions zorg/buildbot/builders/ClangBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,17 +533,18 @@ def _getClangCMakeBuildFactory(
env=env))

# Get generated python, lnt
python = util.Interpolate('%(prop:builddir)s/test/sandbox/bin/python')
lnt = util.Interpolate('%(prop:builddir)s/test/sandbox/bin/lnt')
lnt_setup = util.Interpolate('%(prop:builddir)s/test/lnt/setup.py')
python = InterpolateToPosixPath('%(prop:builddir)s/test/sandbox/Scripts/python')
Copy link
Contributor

@DavidSpickett DavidSpickett Sep 2, 2025

Choose a reason for hiding this comment

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

This is not correct for Linux:

/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox/Scripts/python -m pip install setuptools
 in dir /home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox (timeout 1200 secs)
 watching logfiles {}
 argv: [b'/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox/Scripts/python', b'-m', b'pip', b'install', b'setuptools']
 environment:
  HOME=/home/tcwg-buildbot
  HOSTNAME=linaro-clang-aarch64-lld-2stage
  LANG=en_US.UTF-8
  LOGNAME=tcwg-buildbot
  MAIL=/var/mail/tcwg-buildbot
  NO_STOP_MESSAGE=1
  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
  PWD=/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox
  SHELL=/bin/bash
  SHLVL=0
  SUDO_COMMAND=/bin/bash -c buildbot-worker restart --nodaemon /home/tcwg-buildbot/worker
  SUDO_GID=0
  SUDO_UID=0
  SUDO_USER=root
  TERM=xterm
  USER=tcwg-buildbot
  _=/usr/bin/buildbot-worker
 using PTY: False
Upon execvpe b'/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox/Scripts/python' [b'/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox/Scripts/python', b'-m', b'pip', b'install', b'setuptools'] in environment id 251397130647040
:Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/twisted/internet/process.py", line 397, in _fork
    self._execChild(path, uid, gid, executable, args, environment)
  File "/usr/lib/python3/dist-packages/twisted/internet/process.py", line 468, in _execChild
    os.execvpe(executable, args, environment)
  File "/usr/lib/python3.10/os.py", line 584, in execvpe
    _execvpe(file, args, env)
  File "/usr/lib/python3.10/os.py", line 598, in _execvpe
    exec_func(file, *argrest)
FileNotFoundError: [Errno 2] No such file or directory: b'/home/tcwg-buildbot/worker/clang-aarch64-lld-2stage/test/sandbox/Scripts/python'
program finished with exit code 1
elapsedTime=0.048819

Needs to be /bin:

$ ./worker/clang-aarch64-lld-2stage/test/sandbox/bin/python
Python 3.10.12 (main, May 27 2025, 17:12:29) [GCC 11.4.0] on linux

lnt_ext = '.exe' if vs else ''
lnt = InterpolateToPosixPath(f'%(prop:builddir)s/test/sandbox/Scripts/lnt{lnt_ext}')
lnt_setup = InterpolateToPosixPath('%(prop:builddir)s/test/lnt/setup.py')

# Paths
sandbox = util.Interpolate('%(prop:builddir)s/test/sandbox')
test_suite_dir = util.Interpolate('%(prop:builddir)s/test/test-suite')
sandbox = InterpolateToPosixPath('%(prop:builddir)s/test/sandbox')
test_suite_dir = InterpolateToPosixPath('%(prop:builddir)s/test/test-suite')

# Get latest built Clang (stage1 or stage2)
cc = util.Interpolate(f'%(prop:builddir)s/{compiler_path}/bin/{cc}')
cxx = util.Interpolate(f'%(prop:builddir)s/{compiler_path}/bin/{cxx}')
cc = InterpolateToPosixPath(f'%(prop:builddir)s/{compiler_path}/bin/{cc}')
cxx = InterpolateToPosixPath(f'%(prop:builddir)s/{compiler_path}/bin/{cxx}')

# LNT Command line (don't pass -jN. Users need to pass both --threads
# and --build-threads in nt_flags/test_suite_flags to get the same effect)
Expand All @@ -558,7 +559,7 @@ def _getClangCMakeBuildFactory(
# Append any option provided by the user
test_suite_cmd.extend(nt_flags)
else:
lit = util.Interpolate(f'%(prop:builddir)s/{stage1_build}/bin/llvm-lit')
lit = InterpolateToPosixPath(f'%(prop:builddir)s/{stage1_build}/bin/llvm-lit')
test_suite_cmd = [python, lnt, 'runtest', 'test-suite',
'--no-timestamp',
'--sandbox', sandbox,
Expand All @@ -567,7 +568,7 @@ def _getClangCMakeBuildFactory(
'--cxx', cxx,
'--use-lit', lit,
# Carry on building even if there is a failure.
'--build-tool-options', '"-k"']
'--build-tool-options', '"-k 0"' if '--use-make=ninja' in testsuite_flags else '"-k"']
# Enable fortran if flang is checked out
if checkout_flang:
fortran_flags = [
Expand Down