summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-09-14 09:48:02 +0200
committerThomas Haller <thaller@redhat.com>2018-09-14 14:07:36 +0200
commit58b030f39a3241313fd500a67bff5d1b07019b30 (patch)
treeb6667b7937c1fb652062ee3dc1d3765e4cccf897
parentaa8a7559a330269f49cdc5ae16743a6ec491b659 (diff)
downloadNetworkManager-58b030f39a3241313fd500a67bff5d1b07019b30.tar.gz
contrib/rpm: always run tests and enable more compiler warnings in package build
- always enable more compiler warnings. They are not marked as breaking the build anyway. - also, always build with '--with-tests=yes'. Note that our autotools is actually very nice. Even if you build '--with-tests=no', you still can run `make check` and the tests are build on demand. The only difference here is whether the tests are build during `make` or during `make check`. While little difference, build everything during the `make` step. - when running tests, use `make -k check`. Even if they fail, we want to run the entire test suite. - also running tests are disabled, still run them. But don't let them fail the build.
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec8
1 files changed, 3 insertions, 5 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index d31a548417..c48a82c330 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -540,12 +540,8 @@ intltoolize --automake --copy --force
--with-systemdsystemunitdir=%{systemd_dir} \
--with-system-ca-path=/etc/pki/tls/cert.pem \
--with-dbus-sys-dir=%{dbus_sys_dir} \
-%if %{with test}
--with-tests=yes \
-%else
--enable-more-warnings=yes \
- --with-tests=no \
-%endif
--with-valgrind=no \
--enable-ifcfg-rh=yes \
%if %{with ppp}
@@ -605,7 +601,9 @@ touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown
%check
%if %{with test}
-make %{?_smp_mflags} check
+make -k %{?_smp_mflags} check
+%else
+make -k %{?_smp_mflags} check || :
%endif