mirror of
https://github.com/mstorsjo/llvm-mingw
synced 2026-06-21 14:01:00 +00:00
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
98684ab807), 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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user