@@ -22,7 +22,7 @@ pipeline {
2222 stages {
2323 stage(' Print Machine Info' ) {
2424 environment {
25- PATH = " $PATH :/usr/bin:/usr/local/bin"
25+ PATH = " /opt/homebrew/bin/: $PATH :/usr/bin:/usr/local/bin"
2626 }
2727 steps {
2828 sh '''
@@ -61,7 +61,7 @@ pipeline {
6161 }
6262 stage(' Setup Venv' ) {
6363 environment {
64- PATH = " $PATH :/usr/bin:/usr/local/bin:/opt/homebrew/bin/ "
64+ PATH = " /opt/homebrew/bin/: $PATH :/usr/bin:/usr/local/bin"
6565 }
6666 steps {
6767 sh '''
@@ -78,7 +78,7 @@ pipeline {
7878 }
7979 stage(' Build' ) {
8080 environment {
81- PATH = " $PATH :/usr/bin:/usr/local/bin:/opt/homebrew/bin/ "
81+ PATH = " /opt/homebrew/bin/: $PATH :/usr/bin:/usr/local/bin"
8282 }
8383 steps {
8484 timeout(240 ) {
@@ -99,6 +99,8 @@ pipeline {
9999
100100 cd -
101101
102+ export PYTHON_HOME=$(python3 -c "import sys; print(sys.base_prefix)")
103+
102104 rm -rf lldb-build/bin/debugserver
103105 # Running too many asanified threads is too stressful for the kernel and we get >90% system time.
104106 export MAX_PARALLEL_TESTS=$(sysctl hw.physicalcpu |awk '{print int(($2+1)/2)}')
@@ -110,7 +112,8 @@ pipeline {
110112 --projects="clang;lld;lldb" \
111113 --runtimes="" \
112114 --cmake-type=Release \
113- --lldb-test-compiler=$(xcrun -find clang)
115+ --lldb-test-compiler=$(xcrun -find clang) \
116+ --cmake-flag="-DPython3_EXECUTABLE=$(which python)"
114117 '''
115118 script {
116119 def LLDB = new org.swift.LLDB()
@@ -121,7 +124,7 @@ pipeline {
121124 }
122125 stage(' Clean Test Results' ) {
123126 environment {
124- PATH = " $PATH :/usr/bin:/usr/local/bin:/opt/homebrew/bin/ "
127+ PATH = " /opt/homebrew/bin/: $PATH :/usr/bin:/usr/local/bin"
125128 }
126129 steps {
127130 timeout(10 ) {
@@ -135,7 +138,7 @@ pipeline {
135138 }
136139 stage(' Test' ) {
137140 environment {
138- PATH = " $PATH :/usr/bin:/usr/local/bin"
141+ PATH = " /opt/homebrew/bin/: $PATH :/usr/bin:/usr/local/bin"
139142 }
140143 steps {
141144 timeout(240 ) {
@@ -144,9 +147,11 @@ pipeline {
144147
145148 source ./venv/bin/activate
146149
150+ export PYTHON_HOME=$(python3 -c "import sys; print(sys.base_prefix)")
151+
147152 rm -rf test/results.xml
148153
149- python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-sanitized test
154+ python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-sanitized test --cmake-flag="-DPython3_EXECUTABLE=$(which python)"
150155 '''
151156 }
152157 }
0 commit comments