[ovs-dev] [PATCH 1/3] system-traffic.at: Skip tests if namespaces or veths aren't supported.
Ilya Maximets
i.maximets at samsung.com
Fri Feb 26 11:57:39 UTC 2016
This prevents failure of test scenarios 'make check-kernel'
and 'make check-system-userspace' if creation of veth pairs or
network namespaces is not supported by kernel (or module isn't loaded).
Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
---
tests/system-common-macros.at | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index fcd7792..c536fb4 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -15,8 +15,8 @@ m4_define([DEL_NAMESPACES],
m4_define([ADD_NAMESPACES],
[m4_foreach([ns], [$@],
[DEL_NAMESPACES(ns)
- AT_CHECK([ip netns add ns])
- on_exit 'DEL_NAMESPACES(ns)'
+ AT_SKIP_IF([! ip netns add ns])
+ on_exit 'DEL_NAMESPACES(ns)'
])
]
)
@@ -66,7 +66,7 @@ m4_define([ADD_INT],
# The existing 'port' or 'ovs-port' will be removed before new ones are added.
#
m4_define([ADD_VETH],
- [ AT_CHECK([ip link add $1 type veth peer name ovs-$1])
+ [ AT_SKIP_IF([! ip link add $1 type veth peer name ovs-$1])
AT_CHECK([ip link set $1 netns $2])
AT_CHECK([ip link set dev ovs-$1 up])
AT_CHECK([ovs-vsctl add-port $3 ovs-$1])
--
2.5.0
More information about the dev
mailing list