Different platforms need different steps to set up pktio for testing. That
might be veth devices for linux-generic, kernel modules and extended set up
for dpdk and simple set pktio testing names for other platforms. This patch
implements platform/test/pktio_env file which sets up global envs for pktio.
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
platform/linux-generic/Makefile.am | 2 +
platform/linux-generic/m4/configure.m4 | 2 +
platform/linux-generic/test/Makefile.am | 1 +
platform/linux-generic/test/pktio_env | 120 +++++++++++++++++++++++++++++
test/README | 6 ++
test/validation/odp_pktio_run | 129 +++++++-------------------------
6 files changed, 157 insertions(+), 103 deletions(-)
create mode 100644 platform/linux-generic/test/Makefile.am
create mode 100644 platform/linux-generic/test/pktio_env
diff --git a/platform/linux-generic/Makefile.am
b/platform/linux-generic/Makefile.am
index e5558ac..033be51 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -5,6 +5,8 @@ AM_CFLAGS += -I$(srcdir)/include
AM_CFLAGS += -I$(top_srcdir)/include
AM_CFLAGS += -I$(top_srcdir)/helper/include
+SUBDIRS = test
+
include_HEADERS = \
$(top_srcdir)/include/odp.h
diff --git a/platform/linux-generic/m4/configure.m4
b/platform/linux-generic/m4/configure.m4
index 00f2f89..55124f1 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -15,3 +15,5 @@ AC_LINK_IFELSE(
echo "GCC-style __atomic builtins not supported by the compiler."
echo "Use newer version. For gcc > 4.7.0"
exit -1)
+
+AC_CONFIG_FILES([platform/linux-generic/test/Makefile])
diff --git a/platform/linux-generic/test/Makefile.am
b/platform/linux-generic/test/Makefile.am
new file mode 100644
index 0000000..91e361c
--- /dev/null
+++ b/platform/linux-generic/test/Makefile.am
@@ -0,0 +1 @@
+dist_bin_SCRIPTS = $(srcdir)/pktio_env
diff --git a/platform/linux-generic/test/pktio_env
b/platform/linux-generic/test/pktio_env
new file mode 100644
index 0000000..5e547e4
--- /dev/null
+++ b/platform/linux-generic/test/pktio_env
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# Copyright (c) 2015, Linaro Limited
+# All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Test script wrapper for running ODP pktio apps on linux-generic.
+#
+# For linux-generic the default behavior is to create two pairs of
+# virtual Ethernet interfaces and provide the names of these via
+# environment variables to pktio apps, the interfaces will be removed
+# before the script exits.
+#
+# Note that the creation of virtual Ethernet devices depends on having
+# CONFIG_VETH enabled in the kernel, if not enabled the env setup will be
skipped.
+#
+# Network set up
+# IF0 <---> IF1
+# IF2 <---> IF3
+IF0=pktio-p0-p1
+IF1=pktio-p1-p0
+IF2=pktio-p2-p3
+IF3=pktio-p3-p2
+
+if [ "$0" = "$BASH_SOURCE" ]; then
+ echo "Error: Platform specific env file has to be sourced."
+fi
+
+check_for_root()
+{
+ if [ "$(id -u)" != "0" ]; then
+ echo "check_for_root(): need to be root to setup VETH"
+ return 1
+ fi
+ return 0
+}
+
+# wait for a network interface's operational state to be "up"
+wait_for_iface_up()
+{
+ iface=$1
+ cnt=0
+
+ while [ $cnt -lt 50 ]; do
+ read operstate < /sys/class/net/$iface/operstate
+
+ if [ $? -ne 0 ]; then
+ break
+ elif [ "$operstate" = "up" ]; then
+ return 0
+ fi
+
+ sleep 0.1
+ cnt=`expr $cnt + 1`
+ done
+
+ return 1
+}
+
+setup_pktio_env()
+{
+ echo "pktio: setting up test interfaces $IF0, $IF1, $IF2, $IF3."
+
+ check_for_root
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+
+ for iface in $IF0 $IF1 $IF2 $IF3; do
+ ip link show $iface 2> /dev/null
+ if [ $? -eq 0 ]; then
+ echo "pktio: interface $iface already exist $?"
+ return 2
+ fi
+ done
+
+ if [ "$1" = "clean" ]; then
+ trap cleanup_pktio_env EXIT
+ fi
+
+ ip link add $IF0 type veth peer name $IF1
+ if [ $? -ne 0 ]; then
+ echo "pktio: error: unable to create veth pair"
+ return 3
+ fi
+ ip link add $IF2 type veth peer name $IF3
+ if [ $? -ne 0 ]; then
+ echo "pktio: error: unable to create veth pair"
+ return 4
+ fi
+
+ for iface in $IF0 $IF1 $IF2 $IF3; do
+ ip link set $iface mtu 9216 up
+ ifconfig $iface -arp
+ done
+
+ # check that the interface has come up before starting the test
+ for iface in $IF0 $IF1 $IF2 $IF3; do
+ wait_for_iface_up $iface
+ if [ $? -ne 0 ]; then
+ echo "pktio: interface $iface failed to come up"
+ return 5
+ fi
+ done
+}
+
+cleanup_pktio_env()
+{
+ echo "pktio: removing test interfaces $IF0, $IF1, $IF2, $IF3"
+ check_for_root
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+
+ for iface in $IF0 $IF1 $IF2 $IF3; do
+ ip link del $iface 2> /dev/null
+ done
+ return 0
+}
diff --git a/test/README b/test/README
index 045f88b..41a1b95 100644
--- a/test/README
+++ b/test/README
@@ -1,2 +1,8 @@
Files in this directory are intended to be terse checks that help ensure
that the ODP API Implementations all perform identically and to specification.
+
+Some tests scripts, like pktio require ODP_PLATFORM variable to be exported to
load
+platform specific env files. 'make check' defines that variable automatically,
+and package will put all required files at the same place as tests binaries.
But if
+you run tests manually from odp source code then you need it to be defined,
like:
+export ODP_PLATFROM=linux-generic.
diff --git a/test/validation/odp_pktio_run b/test/validation/odp_pktio_run
index b725a5f..fc353de 100755
--- a/test/validation/odp_pktio_run
+++ b/test/validation/odp_pktio_run
@@ -1,104 +1,33 @@
#!/bin/sh
#
-# Test script wrapper for running ODP pktio tests on linux-generic.
+# Copyright (c) 2015, Linaro Limited
+# All rights reserved.
#
-# For platforms other than linux-generic this script does nothing other
-# than running the odp_pktio binary, odp_pktio will then attempt to
-# open and use the special device named "loop" for testing.
-#
-# For linux-generic the default behaviour is to create a pair of
-# virtual Ethernet interfaces and provide the names of these via
-# environment variables to odp_pktio, the interfaces will be removed
-# before the script exits. Note that the creation of virtual Ethernet
-# devices depends on having CONFIG_VETH enabled in the kernel, if not
-# enabled the test will be skipped.
-#
-# The evironment variable ODP_PLATFORM is used to determine the
-# platform under test, when this script is invoked via 'make check'
-# this variable is set automatically.
-#
-# It's also possible to split up the steps, which makes it easier when
-# debugging, for example;
-#
-# export ODP_PLATFORM=linux-generic
-# odp_pktio_run setup
-# wireshark -i pktio-p0 -k &
-# odp_pktio_run
-# (repeat running test multiple times..)
-# odp_pktio_run cleanup
+# SPDX-License-Identifier: BSD-3-Clause
#
+
TEST_DIR="${TEST_DIR:-$(dirname $0)}"
-IF0=pktio-p0
-IF1=pktio-p1
# exit codes expected by automake for skipped tests
TEST_SKIPPED=77
-# wait for a network interface's operational state to be "up"
-wait_for_iface_up()
-{
- iface=$1
- cnt=0
-
- while [ $cnt -lt 50 ]; do
- read operstate < /sys/class/net/$iface/operstate
-
- if [ $? != 0 ]; then
- break
- elif [ "$operstate" = "up" ]; then
- return 0
- fi
-
- sleep 0.1
- cnt=`expr $cnt + 1`
- done
-
- return 1
-}
-
-setup_env1()
-{
- ip link show $IF0 2> /dev/null
- if [ $? = 0 ]; then
- ip link show $IF1 2> /dev/null
- if [ $? = 0 ]; then
- echo "pktio: interfaces $IF0 and $IF1 already exist"
- return
- fi
+# Use installed pktio env or for make check take it from platform directory
+if [ -f "./pktio_env" ]; then
+ . ./pktio_env
+else if [ "$ODP_PLATFORM" = "" ]; then
+ echo "$0: error: ODP_PLATFORM must be defined"
+ # not skipped as this should never happen via "make check"
+ exit 1
+else if [ -f ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ]; then
+ . ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env
+else
+ echo "BUG: unable to find pktio_env!"
+ echo "pktio_env has to be in current directory or in
platform/\$ODP_PLATFORM/test."
+ echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
+ exit 1
fi
-
- echo "pktio: setting up test interfaces $IF0 and $IF1"
-
- if [ "$1" = "clean" ]; then
- trap cleanup_env1 EXIT
- fi
-
- ip link add $IF0 type veth peer name $IF1
- if [ $? != 0 ]; then
- echo "pktio: error: unable to create veth pair"
- exit $TEST_SKIPPED
- fi
- ip link set $IF0 mtu 9216 up
- ip link set $IF1 mtu 9216 up
- ifconfig $IF0 -arp
- ifconfig $IF1 -arp
-
- # check that the interface has come up before starting the test
- for iface in $IF0 $IF1; do
- wait_for_iface_up $iface
- if [ $? != 0 ]; then
- echo "pktio: interface $iface failed to come up"
- exit 1
- fi
- done
-}
-
-cleanup_env1()
-{
- echo "pktio: removing test interfaces $IF0 and $IF1"
- ip link del $IF0 2> /dev/null
- ip link del $IF1 2> /dev/null
-}
+fi
+fi
run_test()
{
@@ -116,12 +45,12 @@ run_test()
export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
fi
$TEST_DIR/odp_pktio
- if [ $? != 0 ]; then
+ if [ $? -ne 0 ]; then
ret=1
fi
done
- if [ $ret != 0 ]; then
+ if [ $ret -ne 0 ]; then
echo "!!! FAILED !!!"
fi
@@ -138,7 +67,7 @@ run()
if [ "$ODP_PKTIO_IF0" = "" ]; then
# no interfaces specified on linux-generic, use defaults
- setup_env1 clean
+ setup_pktio_env clean
export ODP_PKTIO_IF0=$IF0
export ODP_PKTIO_IF1=$IF1
fi
@@ -146,14 +75,8 @@ run()
run_test
}
-if [ "$ODP_PLATFORM" = "" ]; then
- echo "pktio: error: ODP_PLATFORM must be defined"
- # not skipped as this should never happen via "make check"
- exit 1
-fi
-
case "$1" in
- setup) setup_env1 ;;
- cleanup) cleanup_env1 ;;
- *) run ;;
+ setup) setup_pktio_env ;;
+ cleanup) cleanup_pktio_env ;;
+ *) run ;;
esac
--
1.9.1
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
