Optimize enabled DT testcases
(cherry picked from commit 694135477b937ccb2ab5acfa8b7d554561bbc455)
This commit is contained in:
parent
bf8ff030c2
commit
46fda456df
@ -1,7 +1,7 @@
|
|||||||
#needsrootforbuild
|
#needsrootforbuild
|
||||||
Name: conntrack-tools
|
Name: conntrack-tools
|
||||||
Version: 1.4.6
|
Version: 1.4.6
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Userspace tools for interacting with the Connection Tracking System
|
Summary: Userspace tools for interacting with the Connection Tracking System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://conntrack-tools.netfilter.org/
|
URL: http://conntrack-tools.netfilter.org/
|
||||||
@ -44,15 +44,6 @@ sed -i "s/DEFAULT_INCLUDES = -I./DEFAULT_INCLUDES = -I. -I\/usr\/include\/tirpc/
|
|||||||
CFLAGS="${CFLAGS} -Wl,-z,lazy"
|
CFLAGS="${CFLAGS} -Wl,-z,lazy"
|
||||||
CXXFLAGS="${CXXFLAGS} -Wl,-z,lazy"
|
CXXFLAGS="${CXXFLAGS} -Wl,-z,lazy"
|
||||||
|
|
||||||
%check
|
|
||||||
cd tests/conntrack
|
|
||||||
sh run-test.sh
|
|
||||||
cp ../../src/nfct /usr/sbin/
|
|
||||||
cd ../nfct
|
|
||||||
sh run-test.sh
|
|
||||||
rm -f /usr/sbin/nfct
|
|
||||||
cd ../../
|
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
rm -f doc/sync/notrack/conntrackd.conf.orig doc/sync/alarm/conntrackd.conf.orig doc/helper/conntrackd.conf.orig
|
rm -f doc/sync/notrack/conntrackd.conf.orig doc/sync/alarm/conntrackd.conf.orig doc/helper/conntrackd.conf.orig
|
||||||
chmod 644 doc/sync/primary-backup.sh
|
chmod 644 doc/sync/primary-backup.sh
|
||||||
@ -65,6 +56,14 @@ install -d 0755 %{buildroot}%{_unitdir}
|
|||||||
install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/
|
install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/
|
||||||
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
|
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
|
||||||
|
|
||||||
|
%check
|
||||||
|
cd tests/conntrack
|
||||||
|
sh run-test.sh
|
||||||
|
cd ../nfct
|
||||||
|
sed -i "s/\/usr\/sbin/..\/..\/src/g" test.c
|
||||||
|
sh run-test.sh
|
||||||
|
cd ../../
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%systemd_post conntrackd.service
|
%systemd_post conntrackd.service
|
||||||
|
|
||||||
@ -88,6 +87,12 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 19 2023 yanglu <yanglu72@h-partners.com> - 1.4.6-6
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Optimize enabled DT testcases
|
||||||
|
|
||||||
* Mon Jan 09 2023 zhanghao <zhanghao383@huawei.com> - 1.4.6-5
|
* Mon Jan 09 2023 zhanghao <zhanghao383@huawei.com> - 1.4.6-5
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user