MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: add ptest support

Browse Source 
Install openvswitch test suite and run it as ptest.

Signed-off-by: Radu Patriu <radu.patriu@enea.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Radu Patriu 2014-03-31 11:49:58 +03:00 committed by Bruce Ashfield
parent 594a85674c
commit 36b5a4ca38
3 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
recipes-networking/openvswitch/files/openvswitch-add-ptest.patch Normal file
View File

@ -0,0 +1,67 @@
Add test-install rule to support ptest execution
Signed-off-by: Radu Patriu <radu.patriu@enea.com>
Index: ovs/Makefile.am
===================================================================
--- ovs.orig/Makefile.am 2014-03-10 16:19:46.000000000 +0200
+++ ovs/Makefile.am 2014-03-10 16:23:10.481075341 +0200
@@ -276,3 +276,4 @@
include python/automake.mk
include python/compat/automake.mk
include tutorial/automake.mk
+include test.mk
Index: ovs/test.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ ovs/test.mk 2014-03-10 16:42:41.000000000 +0200
@@ -0,0 +1,49 @@
+TEST_DEST ?= ${prefix}/lib/openvswitch
+TEST_ROOT ?= ${prefix}/lib/openvswitch
+TEST_DEPEND =
+
+if HAVE_OPENSSL
+TEST_DEPEND += $(TESTPKI_FILES)
+endif
+
+test-install: $(TEST_DEPEND)
+ @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\
+ install -d $(TEST_DEST)/tests ;\
+ install -d $(TEST_DEST)/python ;\
+ install -d $(TEST_DEST)/python/ovs ;\
+ install -d $(TEST_DEST)/python/ovs/db ;\
+ install -d $(TEST_DEST)/python/ovs/unixctl ;\
+ install -d $(TEST_DEST)/vswitchd ;\
+ install vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\
+ install -d $(TEST_DEST)/debian ;\
+ install debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\
+ install -d $(TEST_DEST)/build-aux ;\
+ install build-aux/check-structs $(TEST_DEST)/build-aux ;\
+ install -d $(TEST_DEST)/xenserver ;\
+ install xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\
+ install xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\
+ install xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\
+ install xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\
+ install xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\
+ install -d $(TEST_DEST)/vtep ;\
+ install vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\
+ for p in $$list ; do \
+ echo $$p ;\
+ p=$${p#./} ;\
+ pre=$${p#tests\/} ;\
+ if test $$pre != $$p ; then \
+ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\
+ install $$p $(TEST_DEST)/tests/$$pre ;\
+ continue ;\
+ fi ;\
+ pre=$${p#python\/ovs\/} ;\
+ if test $$pre != $$p ; then \
+ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\
+ install $$p $(TEST_DEST)/python/ovs/$$pre ;\
+ continue ;\
+ fi; \
+ done ;\
+ sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
+ sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
+ sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
+ sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig

4
recipes-networking/openvswitch/files/run-ptest Normal file
View File

@ -0,0 +1,4 @@
#!/bin/sh
./tests/testsuite --am-fmt -C tests AUTOTEST_PATH=utilities:vswitchd:ovsdb:tests

16
recipes-networking/openvswitch/openvswitch_2.0.0.bb
View File

@ -14,6 +14,10 @@ RDEPENDS_${PN}-pki = "${PN}"
RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch"
RRECOMMENDS_${PN} += "kernel-module-openvswitch"
RDEPENDS_${PN}-ptest += "python-logging python-syslog python-argparse python-io \
python-fcntl python-shell python-lang python-xml python-math \
python-datetime python-netclient python sed"
# Some installers will fail because of an install order based on
# rdeps. E.g. ovs-pki calls sed in the postinstall. sed may be
# queued for install later.
@ -26,7 +30,9 @@ SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \
file://openvswitch-controller-setup \
file://openvswitch-add-target-python-handling.patch \
file://openvswitch-add-target-perl-handling.patch \
file://openvswitch-add-more-target-python-substitutions.patch \
file://openvswitch-add-more-target-python-substitutions.patch \
file://openvswitch-add-ptest.patch \
file://run-ptest \
"
SRC_URI[md5sum] = "7d7a58350e634e515e0fe43c64d64f44"
@ -60,7 +66,13 @@ FILES_${PN}-switch = "${sysconfdir}/init.d/openvswitch-switch \
FILES_${PN} += "${datadir}/ovsdbmonitor"
FILES_${PN} += "/run"
inherit autotools update-rc.d
inherit autotools update-rc.d ptest
EXTRA_OEMAKE += "TEST_DEST=${D}${PTEST_PATH} TEST_ROOT=${PTEST_PATH}"
do_install_ptest() {
oe_runmake test-install
}
INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller"
INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch"