Skip to content

Commit 3ec814d

Browse files
committed
workflows: Fix libclc-tests
The old out-of-tree build configuration stopped working and in tree builds are supported now, so we should use the in tree configuration. The only downside is we can't run the tests any more, but at least we will be able to test the build again.
1 parent c300403 commit 3ec814d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/workflows/llvm-project-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
-DCMAKE_BUILD_TYPE=Release \
132132
-DLLVM_ENABLE_ASSERTIONS=ON \
133133
-DLLDB_INCLUDE_TESTS=OFF \
134+
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" \
134135
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
135136
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
136137
$extra_cmake_args \
@@ -142,8 +143,6 @@ jobs:
142143
env:
143144
LLVM_BUILDDIR: ${{ steps.build-llvm.outputs.llvm-builddir }}
144145
run: |
145-
# Make sure all of LLVM libraries that llvm-config needs are built.
146+
# The libclc tests don't have a generated check target so all we can
147+
# do is build it.
146148
ninja -C "$LLVM_BUILDDIR"
147-
cmake -G Ninja -S libclc -B libclc-build -DLLVM_DIR="$LLVM_BUILDDIR"/lib/cmake/llvm -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"
148-
ninja -C libclc-build
149-
ninja -C libclc-build test

0 commit comments

Comments
 (0)