openmp: tests, few failures

+21 -4
+9 -4
pkgs/development/compilers/llvm/14/openmp/default.nix
··· 5 5 , runCommand 6 6 , cmake 7 7 , llvm 8 + , lit 8 9 , clang-unwrapped 9 10 , perl 10 11 , pkg-config ··· 26 27 patches = [ 27 28 ./gnu-install-dirs.patch 28 29 ./fix-find-tool.patch 30 + ./run-lit-directly.patch 29 31 ]; 30 32 31 33 outputs = [ "out" "dev" ]; 32 34 33 - nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; 35 + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped lit ]; 34 36 buildInputs = [ llvm ]; 35 37 36 - cmakeFlags = [ 37 - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails 38 - ]; 38 + doCheck = true; 39 + checkTarget = "check-openmp"; 40 + 41 + preCheck = '' 42 + patchShebangs ../tools/archer/tests/deflake.bash 43 + ''; 39 44 40 45 meta = llvm_meta // { 41 46 homepage = "https://openmp.llvm.org/";
+12
pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch
··· 1 + diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake 2 + --- a/cmake/OpenMPTesting.cmake 3 + +++ b/cmake/OpenMPTesting.cmake 4 + @@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) 5 + if (${OPENMP_STANDALONE_BUILD}) 6 + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) 7 + add_custom_target(${target} 8 + - COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} 9 + + COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} 10 + COMMENT ${comment} 11 + DEPENDS ${ARG_DEPENDS} 12 + USES_TERMINAL