Skip to content

Commit 8e94378

Browse files
[ClangBuilder] Correct path of testsuite virtualenv's Python (#586)
Fixes 60d2141. On Windows, it's Scripts/python, on Linux it's bin/python. Unfortunately there is no third common path to use. Even the virtualenv docs have different paths for Windows and everything else: https://virtualenv.pypa.io/en/latest/user_guide.html#quick-start
1 parent 0972188 commit 8e94378

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

zorg/buildbot/builders/ClangBuilder.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,8 @@ def _getClangCMakeBuildFactory(
533533
env=env))
534534

535535
# Get generated python, lnt
536-
python = InterpolateToPosixPath('%(prop:builddir)s/test/sandbox/Scripts/python')
536+
virtualenv_dir = 'Scripts' if vs else 'bin'
537+
python = InterpolateToPosixPath(f'%(prop:builddir)s/test/sandbox/{virtualenv_dir}/python')
537538
lnt_ext = '.exe' if vs else ''
538539
lnt = InterpolateToPosixPath(f'%(prop:builddir)s/test/sandbox/Scripts/lnt{lnt_ext}')
539540
lnt_setup = InterpolateToPosixPath('%(prop:builddir)s/test/lnt/setup.py')

0 commit comments

Comments
 (0)