From 84c8483ebab2132441573ab9101eb810a450d19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 24 Feb 2026 12:14:31 +0200 Subject: [PATCH] github: Fix testing openmp in the runtimes build This makes sure the openmp tests actually are executed; since switching to the runtimes build of openmp for the tests (in 98684ab80772f01ca342836b41de81fbf6080582), the tests weren't executed, as it no longer found the tools necessary for executing the tests - as they are expected to be specified differently in the runtimes build mode. This requires the commit 48a5119d8e7d7236a28c14d06ec215ef3366ef90 (backported to 22.x in 9794a7932465bdc244b327388905d66df38485e2, part of the 22.1.1 release) in llvm-project, to be able to run tests without actually building clang in the same build as the test tools. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 455c4c4..b13f686 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -592,7 +592,7 @@ jobs: -DCMAKE_C_COMPILER=clang ` -DCMAKE_CXX_COMPILER=clang++ ninja not FileCheck - echo "TOOLS=$PWD\bin" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + echo "TOOLS=$PWD" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - name: Build and test OpenMP run: | cd llvm-project @@ -602,13 +602,13 @@ jobs: -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` -DPython3_EXECUTABLE="$Env:PYTHON_EXE" ` - -DOPENMP_LLVM_TOOLS_DIR="$Env:TOOLS" ` + -DLLVM_BINARY_DIR="$Env:TOOLS" ` -DCMAKE_C_COMPILER=clang ` -DCMAKE_CXX_COMPILER=clang++ ` -DCMAKE_ASM_MASM_COMPILER=llvm-ml ` -DLLVM_ENABLE_RUNTIMES="openmp" ` -DLIBOMP_ASMFLAGS=${{matrix.asmflag}} ` - -DOPENMP_LIT_ARGS="-v --time-tests" + -DLLVM_LIT_ARGS="-v --time-tests" ninja ninja check-openmp