From 46fda456dfe3bc267eaad981a84b0a441dccec08 Mon Sep 17 00:00:00 2001 From: yangl777 Date: Thu, 19 Jan 2023 08:47:36 +0000 Subject: [PATCH] Optimize enabled DT testcases (cherry picked from commit 694135477b937ccb2ab5acfa8b7d554561bbc455) --- conntrack-tools.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/conntrack-tools.spec b/conntrack-tools.spec index c601082..1134fda 100644 --- a/conntrack-tools.spec +++ b/conntrack-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: conntrack-tools Version: 1.4.6 -Release: 5 +Release: 6 Summary: Userspace tools for interacting with the Connection Tracking System License: GPLv2 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" 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 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 @@ -65,6 +56,14 @@ install -d 0755 %{buildroot}%{_unitdir} install -m644 %{SOURCE1} %{buildroot}%{_unitdir}/ 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 %systemd_post conntrackd.service @@ -88,6 +87,12 @@ install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/ %{_mandir}/man8/* %changelog +* Thu Jan 19 2023 yanglu - 1.4.6-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Optimize enabled DT testcases + * Mon Jan 09 2023 zhanghao - 1.4.6-5 - Type:bugfix - ID:NA -- Gitee