From de7eb708a11657e97509ecb79ea45d5b11c861ca Mon Sep 17 00:00:00 2001 From: Chenxi Mao Date: Tue, 6 Dec 2022 10:08:10 +0800 Subject: [PATCH] NetworkManager: set NMTST_FORCE_REAL_ROOT to true to skip some tests OBS build cannot provide REAL_ROOT permission for unit test. So we set NMTST_FORCE_REAL_ROOT to ture to skip this kind of test. This change delivered in Suse Euler 21.09 branch. Change-Id: I873261ca06f4295addc0a514516471510e1c46a6 Signed-off-by: Chenxi Mao (cherry picked from commit 9517bc86c4b74e4f5d9f86278891d958ef73f529) (cherry picked from commit fdc39053f2d16a97ac452b216581d230d6dca1e8) --- NetworkManager.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index dec8016..8667fde 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -50,7 +50,7 @@ Name: NetworkManager Version: 1.32.12 Epoch: 1 -Release: 13 +Release: 14 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -332,7 +332,8 @@ cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_ touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown %check -make %{?_smp_mflags} check +#To avoid some test failed which need root permission +NMTST_FORCE_REAL_ROOT=true %make_build check %pre if [ -f "%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then @@ -486,6 +487,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Tue Dec 6 2022 Chenxi Mao - 1:1.32.12-14 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Set NMTST_FORCE_REAL_ROOT to true to skip test which need root user permission + * Mon Oct 24 2022 wuzx - 1:1.32.12-13 - Type:feature - CVE:NA -- Gitee