mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
b1b4fca4f0
Another straightforward uprev with one fairly large change in the changelog. The Open Virtual Network component has now been moved to its own repo (https://github.com/ovn-org/ovn.git). If you were using this functionality a new recipe will need to be created. The ptest results are similar to after the v2.12 uprev ERROR: 2206 tests were run, 28 failed unexpectedly. 62 tests were skipped. The failed tests were in the following areas: checkpatch.at (5) ovs-ofctl.at (1) tunnel.at(1) tunnel-push-pop.at(3) tunnel-push-pop-ipv6.at(3) dpif-netdev.at (1) pmd.at(1) ofproto-dpif.at (7) bridge.at (2) ovsdb-idl.at(1) mcast-snooping.at(1) packet-type-aware.at(2) None of these affect core functionality or usecases and are similar to the results we see with v1.12. If specific usecases are affected by these failures we should address them on a need to fix basis. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
111 lines
4.7 KiB
Diff
111 lines
4.7 KiB
Diff
From 37df262d2b0f0b8c177aa850623f2c5880484ff0 Mon Sep 17 00:00:00 2001
|
|
From: He Zhe <zhe.he@windriver.com>
|
|
Date: Wed, 30 Mar 2016 06:23:45 -0400
|
|
Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution
|
|
|
|
Signed-off-by: Radu Patriu <radu.patriu@enea.com>
|
|
|
|
Fix ptest for v2.5
|
|
- Copy certain files from srcdir since it has been different from
|
|
build directory.
|
|
- Copy more necessary files for new added test cases.
|
|
- Modify config files for running on target.
|
|
|
|
Signed-off-by: He Zhe <zhe.he@windriver.com>
|
|
|
|
---
|
|
Makefile.am | 1 +
|
|
test.mk | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 75 insertions(+)
|
|
create mode 100644 test.mk
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 7889728..6435399 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -494,3 +494,4 @@ include windows/automake.mk
|
|
include ovn/automake.mk
|
|
include selinux/automake.mk
|
|
include build-aux/automake.mk
|
|
+include test.mk
|
|
diff --git a/test.mk b/test.mk
|
|
new file mode 100644
|
|
index 0000000..0b4587c
|
|
--- /dev/null
|
|
+++ b/test.mk
|
|
@@ -0,0 +1,74 @@
|
|
+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 $(srcdir)/vtep/ovs-vtep $(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/compat ;\
|
|
+ install -d $(TEST_DEST)/python/ovs/compat/sortedcontainers ;\
|
|
+ install -d $(TEST_DEST)/python/ovs/unixctl ;\
|
|
+ install -d $(TEST_DEST)/vswitchd ;\
|
|
+ install $(srcdir)/vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\
|
|
+ install vswitchd/ovs-vswitchd $(TEST_DEST)/vswitchd ;\
|
|
+ install -d $(TEST_DEST)/debian ;\
|
|
+ install $(srcdir)/debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\
|
|
+ install -d $(TEST_DEST)/build-aux ;\
|
|
+ install $(srcdir)/build-aux/check-structs $(TEST_DEST)/build-aux ;\
|
|
+ install -d $(TEST_DEST)/xenserver ;\
|
|
+ install $(srcdir)/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\
|
|
+ install $(srcdir)/xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\
|
|
+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\
|
|
+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\
|
|
+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\
|
|
+ install -d $(TEST_DEST)/vtep ;\
|
|
+ install $(srcdir)/vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\
|
|
+ install -d $(TEST_DEST)/ovn ;\
|
|
+ install $(srcdir)/ovn/ovn-nb.ovsschema $(TEST_DEST)/ovn ;\
|
|
+ install $(srcdir)/ovn/ovn-sb.ovsschema $(TEST_DEST)/ovn ;\
|
|
+ install -d $(TEST_DEST)/utilities ;\
|
|
+ install $(srcdir)/utilities/ovs-pcap.in $(TEST_DEST)/utilities ;\
|
|
+ install $(srcdir)/utilities/ovs-pki.in $(TEST_DEST)/utilities ;\
|
|
+ for p in $$list ; do \
|
|
+ echo $$p ;\
|
|
+ p=$${p#../git/} ;\
|
|
+ pre=$${p#tests\/} ;\
|
|
+ if test $$pre != $$p ; then \
|
|
+ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\
|
|
+ if test -f $$p ; then \
|
|
+ install $$p $(TEST_DEST)/tests/$$pre ;\
|
|
+ else \
|
|
+ install $(srcdir)/$$p $(TEST_DEST)/tests/$$pre ;\
|
|
+ fi ;\
|
|
+ continue ;\
|
|
+ fi ;\
|
|
+ pre=$${p#python\/ovs\/} ;\
|
|
+ if test $$pre != $$p ; then \
|
|
+ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\
|
|
+ if test -f $$p ; then \
|
|
+ install $$p $(TEST_DEST)/python/ovs/$$pre ;\
|
|
+ else \
|
|
+ install $(srcdir)/$$p $(TEST_DEST)/python/ovs/$$pre ;\
|
|
+ fi ;\
|
|
+ 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
|
|
+ sed -i 's|at_srcdir=.*|at_srcdir='"'"'.'"'"'|g' $(TEST_DEST)/tests/atconfig
|
|
+ sed -i 's|at_top_srcdir=.*|at_top_srcdir='"'"'..'"'"'|g' $(TEST_DEST)/tests/atconfig
|
|
+ sed -i 's|at_top_build_prefix=.*|at_top_build_prefix='"'"'../'"'"'|g' $(TEST_DEST)/tests/atconfig
|
|
+ sed -i 's|^\(.*config\.log.*\)|#\1|g' $(TEST_DEST)/tests/testsuite
|
|
+ sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite
|
|
+ sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
|
|
+ sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
|