AF_XDP veth does not support TCP with namespaces. This patch skips two cases that use it. 118: conntrack - floating IP 119: conntrack - negative test for recirculation optimization
Signed-off-by: William Tu <u9012...@gmail.com> --- v2: - skip only 118 and 119. v1: - Tested-at: https://travis-ci.org/williamtu/ovs-travis/builds/606194550 - make check-afxdp all pass on my machine, but cirrus, it is still unstable, observe 1 failed at: https://cirrus-ci.com/task/6597038589870080 --- tests/system-afxdp-macros.at | 6 ++++++ tests/system-kmod-macros.at | 6 ++++++ tests/system-traffic.at | 2 ++ tests/system-userspace-macros.at | 6 ++++++ 4 files changed, 20 insertions(+) diff --git a/tests/system-afxdp-macros.at b/tests/system-afxdp-macros.at index f0683c0a901b..3392c7e5ada3 100644 --- a/tests/system-afxdp-macros.at +++ b/tests/system-afxdp-macros.at @@ -37,3 +37,9 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # m4_define([OVS_START_L7], [AT_SKIP_IF([:])]) + +# OVS_SKIP_AFXDP() +# +# Skip when check-afxdp. +m4_define([OVS_SKIP_AFXDP], + [AT_SKIP_IF([:])]) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 9e89aec43734..cfcd63ab0bab 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -211,3 +211,9 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE], # or necessary for the userspace datapath as it is checking for a kernel # specific regression. m4_define([CHECK_L3L4_CONNTRACK_REASM]) + +# OVS_SKIP_AFXDP() +# +# Skip when check-afxdp. +m4_define([OVS_SKIP_AFXDP], + [AT_SKIP_IF([false])]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 870a05efe04c..32af74c9953b 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -5660,6 +5660,7 @@ AT_CLEANUP AT_SETUP([conntrack - floating IP]) AT_SKIP_IF([test $HAVE_NC = no]) +OVS_SKIP_AFXDP() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() OVS_CHECK_CT_CLEAR() @@ -5735,6 +5736,7 @@ AT_SETUP([conntrack - negative test for recirculation optimization]) dnl This test will fail if 'conn' caching is being used, because the tuple dnl has been changed outside of conntrack. AT_SKIP_IF([test $HAVE_NC = no]) +OVS_SKIP_AFXDP() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() OVS_CHECK_CT_CLEAR() diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index a419f30c1563..6cf2d70ea046 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -323,3 +323,9 @@ m4_define([CHECK_L3L4_CONNTRACK_REASM], [ AT_SKIP_IF([:]) ]) + +# OVS_SKIP_AFXDP() +# +# Skip when check-afxdp. +m4_define([OVS_SKIP_AFXDP], + [AT_SKIP_IF([false])]) -- 2.7.4 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
