Skip to content

Commit 8f65411

Browse files
[ProfCheck] Switch to annotated builder (#563)
This allows setting the LIT_XFAIL environment variable before running ninja which enables excluding tests from a file in the LLVM tree. I do not believe this is possible outside of an annotated builder.
1 parent ae12bdc commit 8f65411

File tree

2 files changed

+31
-14
lines changed

2 files changed

+31
-14
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3606,20 +3606,14 @@
36063606
# Builders for the profcheck configuration
36073607
# These workers run builds with LLVM_ENABLE_PROFCHECK=ON to ensure
36083608
# that profile information is propagated correctly.
3609-
{'name' : "profcheck",
3610-
'workernames' : ["profcheck-b1", "profcheck-b2"],
3611-
'builddir': "profcheck-build",
3612-
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
3613-
clean=True,
3614-
depends_on_projects=['llvm'],
3615-
extra_configure_args=[
3616-
"-DCMAKE_BUILD_TYPE=Release",
3617-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
3618-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
3619-
"-DLLVM_ENABLE_ASSERTIONS=ON",
3620-
"-DLLVM_LIT_ARGS='--exclude-xfail'",
3621-
"-DLLVM_ENABLE_PROFCHECK=ON",
3622-
])},
3609+
{
3610+
"name": "profcheck",
3611+
"workernames": ["profcheck-b1", "profcheck-b2"],
3612+
"builddir": "profcheck-build",
3613+
"factory": AnnotatedBuilder.getAnnotatedBuildFactory(
3614+
script="profcheck.sh", clean=True, depends_on_projects=["llvm"]
3615+
),
3616+
},
36233617
]
36243618

36253619
# LLDB remote-linux builder env variables.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
rm -rf build
6+
mkdir build
7+
cd build
8+
9+
echo @@@CMake@@@
10+
11+
cmake -GNinja \
12+
-DCMAKE_BUILD_TYPE=Release \
13+
-DLLVM_ENABLE_ASSERTIONS=ON \
14+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
15+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
16+
-DLLVM_LIT_ARGS='--exclude-xfail' \
17+
-DLLVM_ENABLE_PROFCHECK=ON \
18+
../llvm
19+
20+
echo @@@Ninja@@@
21+
22+
export LIT_XFAIL="$(cat ../llvm/utils/profcheck-xfail.txt | tr '\n' ';')"
23+
ninja check-llvm

0 commit comments

Comments
 (0)