74 lines
2.0 KiB
Diff
74 lines
2.0 KiB
Diff
From e02ad202d6eec5ee012e24cb1901167f07511055 Mon Sep 17 00:00:00 2001
|
|
From: zhangwenhao <zhangwenhao8@huawei.com>
|
|
Date: Thu, 28 Jan 2021 22:41:36 +0800
|
|
Subject: [PATCH] enable make check tests
|
|
|
|
---
|
|
tests/Makefile.in | 7 +++++++
|
|
tests/ct_events_reliable.c | 4 +++-
|
|
tests/test_filter.c | 5 ++++-
|
|
3 files changed, 25 insertions(+), 2 deletions(-)
|
|
create mode 100644 tests/qa-connlabel.conf
|
|
|
|
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
|
index 7fb8924..4c600df 100644
|
|
--- a/tests/Makefile.in
|
|
+++ b/tests/Makefile.in
|
|
@@ -520,7 +520,13 @@ distdir: $(DISTFILES)
|
|
done
|
|
check-am: all-am
|
|
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
|
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
|
|
+ $(MAKE) $(AM_MAKEFLAGS)
|
|
+ ./test_api
|
|
+ ./test_connlabel
|
|
+ ../utils/conntrack_flush
|
|
+ ./ct_stress 10000 & ./ct_events_reliable
|
|
+ ../utils/conntrack_flush
|
|
+
|
|
check: check-am
|
|
all-am: Makefile
|
|
installdirs:
|
|
diff --git a/tests/ct_events_reliable.c b/tests/ct_events_reliable.c
|
|
index b51d0e5..26ff8e9 100644
|
|
--- a/tests/ct_events_reliable.c
|
|
+++ b/tests/ct_events_reliable.c
|
|
@@ -20,9 +20,11 @@ static int event_cb(enum nf_conntrack_msg_type type,
|
|
else if (type == NFCT_T_DESTROY)
|
|
destroy++;
|
|
|
|
- if ((++events % 10000) == 0)
|
|
+ if ((++events % 3) == 0) {
|
|
printf("%d events received (%d new, %d update, %d destroy)\n",
|
|
events, new, update, destroy);
|
|
+ return NFCT_CB_STOP;
|
|
+ }
|
|
|
|
return NFCT_CB_CONTINUE;
|
|
}
|
|
diff --git a/tests/test_filter.c b/tests/test_filter.c
|
|
index 7877819..efc7c3b 100644
|
|
--- a/tests/test_filter.c
|
|
+++ b/tests/test_filter.c
|
|
@@ -20,7 +20,7 @@ static int event_cb(enum nf_conntrack_msg_type type,
|
|
nfct_snprintf(buf, sizeof(buf), ct, type, NFCT_O_PLAIN, NFCT_OF_TIME);
|
|
printf("%s\n", buf);
|
|
|
|
- if (++n == 10)
|
|
+ if (++n == 1)
|
|
return NFCT_CB_STOP;
|
|
|
|
return NFCT_CB_CONTINUE;
|
|
@@ -61,6 +61,9 @@ int main(void)
|
|
.addr = ntohl(inet_addr("127.0.0.1")) + i,
|
|
.mask = 0xffffffff,
|
|
};
|
|
+ nfct_filter_set_logic(filter,
|
|
+ NFCT_FILTER_SRC_IPV4,
|
|
+ NFCT_FILTER_LOGIC_NEGATIVE);
|
|
nfct_filter_add_attr(filter, NFCT_FILTER_SRC_IPV4, &fltr_ipv4);
|
|
};
|
|
|
|
--
|
|
2.23.0
|