From a47388f920237b801b73638a4c8fc4aa77ba866f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 19 Mar 2018 16:26:08 +0000 Subject: [PATCH] Package lit tests and googletest sources --- llvm.spec | 80 ++++++++++++++++++++++++++++++++++++++++++++++++- run-lit-tests | 17 +++++++++++ tests/tests.yml | 11 +++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100755 run-lit-tests create mode 100644 tests/tests.yml diff --git a/llvm.spec b/llvm.spec index cfd88ce..b1f8ba2 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,3 +1,4 @@ +%global debug_package %{nil} # Components enabled if supported by target architecture: %ifarch %ix86 x86_64 %bcond_without gold @@ -49,12 +50,13 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 0.4.rc%{rc_ver}%{?dist} +Release: 0.5.rc%{rc_ver}%{?dist} Summary: The Low Level Virtual Machine License: NCSA URL: http://llvm.org Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz +Source1: run-lit-tests Patch3: 0001-CMake-Split-static-library-exports-into-their-own-ex.patch Patch7: 0001-Filter-out-cxxflags-not-supported-by-clang.patch @@ -125,6 +127,24 @@ Summary: LLVM static libraries %description static Static libraries for the LLVM compiler infrastructure. +%if !0%{?compat_build} + +%package test +Summary: LLVM regression tests. + +%description test +LLVM regression tests. +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-lit + +%package googletest +Summary: LLVM's modified googletest sources. + +%description googletest +LLVM's modified googletest sources. + +%endif + %prep %autosetup -n llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 @@ -209,6 +229,44 @@ mv -v %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}} %multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h +# Install binaries needed for lit tests +%global test_binaries lli-child-target llvm-isel-fuzzer llvm-opt-fuzzer yaml-bench +for f in %{test_binaries}; do +install -m 0755 ./bin/$f %{buildroot}%{llvm_bindir} +done + +%global install_srcdir %{buildroot}%{_datadir}/llvm/src +%global lit_cfg test/lit.site.cfg.py +%global lit_unit_cfg test/Unit/lit.site.cfg.py + +cd .. + +# Install gtest sources so clang can use them for gtest +install -d %{install_srcdir} +install -d %{install_srcdir}/utils/ +cp -R utils/unittest %{install_srcdir}/utils/ + +# Generate lit config files. +cat _build/test/lit.site.cfg.py >> %{lit_cfg} +cat _build/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} +sed -i -e s~`pwd`/_build~%{_prefix}~g -e s~`pwd`~.~g %{lit_cfg} %{lit_cfg} %{lit_unit_cfg} + +# obj_root needs to be set to the directory containing the unit test binaries. +sed -i 's~\(config.llvm_obj_root = \)"[^"]\+"~\1"%{llvm_bindir}"~' %{lit_unit_cfg} + +install -d %{buildroot}%{_libexecdir}/tests/llvm +install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/llvm + +# Install lit tests. We need to put these in a tarball otherwise rpm will complain +# about some of the test inputs having the wrong object file format. +install -d %{buildroot}%{_datadir}/llvm/ +tar -czf %{install_srcdir}/test.tar.gz test/ + +# Install the unit test binaries +cp -R _build/unittests %{buildroot}%{llvm_bindir}/ +# FIXME: Can't figure out how to make the find command succeed. +find %{buildroot}%{llvm_bindir} -ignore_readdir_race -iname 'cmake*' -exec rm -Rf '{}' ';' || true + %else # Add version suffix to binaries @@ -272,6 +330,7 @@ fi %exclude %{_bindir}/llvm-config-%{__isa_bits} %exclude %{_mandir}/man1/llvm-config.1.* %{_datadir}/opt-viewer +%exclude %{llvm_bindir}/unittests %else %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %exclude %{pkg_bindir}/llvm-config @@ -332,7 +391,26 @@ fi %{_libdir}/%{name}/lib/*.a %endif +%if !0%{?compat_build} + +%files test +%{_libexecdir}/tests/llvm/ +%{llvm_bindir}/unittests/ +%{_datadir}/llvm/src/test.tar.gz +%{llvm_bindir}/yaml-bench +%{llvm_bindir}/lli-child-target +%{llvm_bindir}/llvm-isel-fuzzer +%{llvm_bindir}/llvm-opt-fuzzer + +%files googletest +%{_datadir}/llvm/src/utils + +%endif + %changelog +* Thu Aug 23 2018 Tom Stellard - 7.0.0-0.5.rc1 +- Package lit tests and googletest sources. + * Mon Aug 20 2018 Tom Stellard - 7.0.0-0.4.rc1 - Re-enable AMDGPU target on ARM rhbz#1618922 diff --git a/run-lit-tests b/run-lit-tests new file mode 100755 index 0000000..12fae3e --- /dev/null +++ b/run-lit-tests @@ -0,0 +1,17 @@ +#!/bin/bash + +set -xe + +#lit -v /usr/share/llvm/src/test + +TOOLS_DIR=/usr/lib64/llvm +cd $(mktemp -d) +tar -xzf /usr/share/llvm/src/test.tar.gz +lit test \ + -DFileCheck=$TOOLS_DIR/FileCheck \ + -Dcount=$TOOlS_DIR/count \ + -Dnot=$TOOLS_DIR/not \ + -Dlli-child-target=$TOOLS_DIR/lli-child-target \ + -Dllvm-isel-fuzzer=$TOOLS_DIR/llvm-isel-fuzzer \ + -Dllvm-opt-fuzzer=$TOOLS_DIR/llvm-opt-fuzzer \ + -Dyaml-bench$TOOLS_DIR/yaml-bench diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..6cc4703 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,11 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - llvm-test + tests: + - rhbz#482491: + dir: ./ + run: /usr/libexec/tests/llvm/run-lit-tests