From 4dfc2af1c68c72c562cd055a043ccfa60127529e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 13 2020 14:55:23 +0000 Subject: Restore running the test suite on Meson builds Meson is pretty critical at this point, so we should be running the test suite for each build to make sure it isn't subtly broken. This reverts commit bbb311520183277acd30bb7f844feadc5a173454. Signed-off-by: Neal Gompa --- diff --git a/meson.spec b/meson.spec index 1fcfac4..2d62567 100644 --- a/meson.spec +++ b/meson.spec @@ -1,5 +1,8 @@ %global libname mesonbuild +# Run tests by default +%bcond_without check + Name: meson Version: 0.52.1 Release: 1%{?dist} @@ -17,6 +20,51 @@ BuildRequires: python3-setuptools Requires: python%{python3_version}dist(setuptools) Requires: ninja-build +%if %{with check} +BuildRequires: ninja-build +# Various languages +BuildRequires: gcc +BuildRequires: libasan +BuildRequires: gcc-c++ +BuildRequires: gcc-gfortran +BuildRequires: gcc-objc +BuildRequires: gcc-objc++ +BuildRequires: java-devel +BuildRequires: mono-core mono-devel +BuildRequires: rust +# Since the build is noarch, we can't use %%ifarch +#%%ifarch %%{ldc_arches} +#BuildRequires: ldc +#%%endif +# Various libs support +BuildRequires: boost-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: vala +BuildRequires: python3-gobject-base +BuildRequires: wxGTK3-devel +BuildRequires: flex +BuildRequires: bison +BuildRequires: gettext +BuildRequires: gnustep-base-devel +BuildRequires: %{_bindir}/gnustep-config +BuildRequires: git-core +BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-sharp-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: gtk-doc +BuildRequires: itstool +BuildRequires: pkgconfig(zlib) +BuildRequires: python3dist(cython) +BuildRequires: pkgconfig(sdl2) +BuildRequires: %{_bindir}/pcap-config +BuildRequires: pkgconfig(vulkan) +BuildRequires: llvm-devel +BuildRequires: cups-devel +%endif + %description Meson is a build system designed to optimize programmer productivity. It aims to do this by providing simple, out-of-the-box @@ -35,6 +83,14 @@ sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} %py3_install install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name} +%if %{with check} +%check +# Remove MPI tests for now because it is complicated to run +rm -rf "test cases/frameworks/17 mpi" +export MESON_PRINT_TEST_OUTPUT=1 +%{__python3} ./run_tests.py +%endif + %files %license COPYING %{_bindir}/%{name}