1 files changed, 380 insertions, 0 deletions

diff --git a/recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch b/recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch
new file mode 100644
index 0000000..10f0df8
--- /dev/null
+++ b/recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch
@@ -0,0 +1,380 @@
+From 1ea34b3e5bf1d386b9931f11dee89bc03f224852 Mon Sep 17 00:00:00 2001
+From: Radu Patriu <radu.patriu@enea.com>
+Date: Tue, 6 May 2014 13:02:10 +0000
+Subject: [PATCH] openvswitchdpdk: enabled ptest
+
+Signed-off-by: Radu Patriu <radu.patriu@enea.com>
+---
+ openvswitch/Makefile.am             |  1 +
+ openvswitch/test.mk                 | 47 ++++++++++++++++++++++++++++++++++++
+ openvswitch/tests/dpdk-datapath.at  | 48 ++++++++++++++++++-------------------
+ openvswitch/tests/dpdk-link.at      |  2 +-
+ openvswitch/tests/dpif-dpdk.at      | 30 +++++++++++------------
+ openvswitch/tests/flowgen.pl        |  0
+ openvswitch/tests/netdev-dpdk.at    |  2 +-
+ openvswitch/tests/ofproto-macros.at |  2 +-
+ openvswitch/tests/ovs-vport.at      | 10 ++++----
+ 9 files changed, 95 insertions(+), 47 deletions(-)
+ create mode 100644 openvswitch/test.mk
+ mode change 100644 => 100755 openvswitch/tests/flowgen.pl
+
+diff --git a/openvswitch/Makefile.am b/openvswitch/Makefile.am
+index d0edfa2..107ca89 100644
+--- a/openvswitch/Makefile.am
++++ b/openvswitch/Makefile.am
+@@ -311,3 +311,4 @@ include xenserver/automake.mk
+ include python/automake.mk
+ include python/compat/automake.mk
+ include tutorial/automake.mk
++include test.mk
+\ No newline at end of file
+diff --git a/openvswitch/test.mk b/openvswitch/test.mk
+new file mode 100644
+index 0000000..10f3629
+--- /dev/null
++++ b/openvswitch/test.mk
+@@ -0,0 +1,47 @@
++TEST_DEST ?= ${prefix}/lib/openvswitchdpdk/ptest
++TEST_ROOT ?= ${prefix}/lib/openvswitchdpdk/ptest
++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 ;\
++       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
+diff --git a/openvswitch/tests/dpdk-datapath.at b/openvswitch/tests/dpdk-datapath.at
+index 5472ae3..16c5f3d 100644
+--- a/openvswitch/tests/dpdk-datapath.at
++++ b/openvswitch/tests/dpdk-datapath.at
+@@ -28,47 +28,47 @@
+ m4_define([OVDK_CHECK_ACTION_EXECUTE],
+ [AT_BANNER([action_execute unit tests - dpdk datapath])
+ AT_SETUP([execute an output action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute an output action with invalid parameters])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__invalid_params], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__invalid_params], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a corrupt action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__corrupt_action], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__corrupt_action], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a drop action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_drop], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_drop], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a pop VLAN action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_pop_vlan], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_pop_vlan], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a set ethernet action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ethernet], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ethernet], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a set ipv4 action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ipv4], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ipv4], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a push VLAN vid action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__vid], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__vid], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute a push VLAN pcp action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__pcp], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__pcp], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute multiple actions with three output actions])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__three_output], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__three_output], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([execute multiple actions with a pop vlan and output action])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__pop_vlan_and_output], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__pop_vlan_and_output], [0], [ignore], [])
+ AT_CLEANUP
+  ])
+ 
+@@ -77,31 +77,31 @@ AT_CLEANUP
+ m4_define([OVDK_CHECK_FLOW_TABLE],
+ [AT_BANNER([flow table unit tests - dpdk datapath])
+ AT_SETUP([add a flow to the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_add_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_add_flow], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([delete a flow from the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_flow], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([delete all flows from the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_all], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_all], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([get a flow from the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_flow], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([modify a flow in the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_mod_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_mod_flow], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([get the first flow from the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_first_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_first_flow], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([get the next flow from the flow table])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_next_flow], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_next_flow], [0], [ignore], [])
+ AT_CLEANUP
+ ])
+ 
+@@ -110,27 +110,27 @@ AT_CLEANUP
+ m4_define([OVDK_CHECK_STATS],
+ [AT_BANNER([stats unit tests - dpdk datapath])
+ AT_SETUP([increment stats for all vports])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_increment], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_increment], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([get stats for all vports])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_get], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_get], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([clear stats for all vports])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_clear], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_clear], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([increment stats for the vswitch])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_increment], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_increment], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([get stats for the vswitch])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_get], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_get], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([clear stats for the vswitch])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_clear], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_clear], [0], [ignore], [])
+ AT_CLEANUP
+  ])
+ 
+diff --git a/openvswitch/tests/dpdk-link.at b/openvswitch/tests/dpdk-link.at
+index accfde9..c119668 100644
+--- a/openvswitch/tests/dpdk-link.at
++++ b/openvswitch/tests/dpdk-link.at
+@@ -29,7 +29,7 @@
+ m4_define([CHECK_DPDK_LINK],
+ [AT_BANNER([dpdk-link tests])
+ AT_SETUP([Check negative cases for dpdk-link.c])
+-AT_CHECK([sudo -E $srcdir/test-dpdk-link -c 1 -n 4], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpdk-link -c 1 -n 4], [0], [ignore], [])
+ AT_CLEANUP
+ ])
+ 
+diff --git a/openvswitch/tests/dpif-dpdk.at b/openvswitch/tests/dpif-dpdk.at
+index 55b3505..b62d146 100644
+--- a/openvswitch/tests/dpif-dpdk.at
++++ b/openvswitch/tests/dpif-dpdk.at
+@@ -2,63 +2,63 @@ m4_define([CHECK_DPIF_DPDK],
+ 
+ [AT_BANNER([Test dpif-dpdk.c ])
+ AT_SETUP([Test dpif_dpdk_get_stats])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_stats], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_stats], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_add])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_add], [0], [ignore], [ignore])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_add], [0], [ignore], [ignore])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_del])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_del], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_del], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_query_by_number])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_number], [0], [ignore], [ignore])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_number], [0], [ignore], [ignore])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_query_by_name])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_name], [0], [ignore], [ignore])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_name], [0], [ignore], [ignore])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_get_max_ports])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_max_ports], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_max_ports], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_dump_start])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_start], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_start], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_dump_next])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_next], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_next], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_dump_done])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_done], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_done], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_poll])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_port_poll_wait])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll_wait], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll_wait], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_flow_put])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_put], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_put], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_flow_del])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_del], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_del], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_flow_dump_start])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_start], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_start], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([Test dpif_dpdk_flow_dump_next])
+-AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_next], [0], [ignore], [])
++AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_next], [0], [ignore], [])
+ AT_CLEANUP
+ ])
+ CHECK_DPIF_DPDK([])
+diff --git a/openvswitch/tests/flowgen.pl b/openvswitch/tests/flowgen.pl
+old mode 100644
+new mode 100755
+diff --git a/openvswitch/tests/netdev-dpdk.at b/openvswitch/tests/netdev-dpdk.at
+index df4cd89..d314e3c 100644
+--- a/openvswitch/tests/netdev-dpdk.at
++++ b/openvswitch/tests/netdev-dpdk.at
+@@ -3,7 +3,7 @@ m4_define([CHECK_DPIF_DPDK],
+ [AT_BANNER([Test netdev-dpdk.c ])
+ 
+ AT_SETUP([Test netdev_dpdk_change_seq])
+-AT_CHECK([sudo -E $srcdir/test-netdev-dpdk --netdev_dpdk_test_change_seq], [0], [ignore], [])
++AT_CHECK([$srcdir/test-netdev-dpdk --netdev_dpdk_test_change_seq], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ ])
+diff --git a/openvswitch/tests/ofproto-macros.at b/openvswitch/tests/ofproto-macros.at
+index 839d41f..ef291dd 100644
+--- a/openvswitch/tests/ofproto-macros.at
++++ b/openvswitch/tests/ofproto-macros.at
+@@ -73,7 +73,7 @@ m4_define([OVS_VSWITCHD_START],
+    AT_CHECK([ovs-vsctl --no-wait init])
+ 
+    dnl Start ovs-vswitchd.
+-   AT_CHECK([ovs-vswitchd --detach --no-chdir --pidfile --enable-dummy$3 --disable-system --log-file -vvconn -vofproto_dpif], [0], [], [stderr])
++   AT_CHECK([ovs-vswitchd -c 1 -n 4 -- --detach --no-chdir --pidfile --enable-dummy$3 --disable-system --log-file -vvconn -vofproto_dpif], [0], [ignore], [stderr])
+    AT_CAPTURE_FILE([ovs-vswitchd.log])
+    AT_CHECK([[sed < stderr '
+ /vlog|INFO|opened log file/d
+diff --git a/openvswitch/tests/ovs-vport.at b/openvswitch/tests/ovs-vport.at
+index 5f6857c..19d87cc 100644
+--- a/openvswitch/tests/ovs-vport.at
++++ b/openvswitch/tests/ovs-vport.at
+@@ -6,23 +6,23 @@ m4_define([OVDK_CHECK_LIBVPORT],
+ [AT_BANNER([libvport/ovs-vport unit tests - dpdk datapath])
+ 
+ AT_SETUP([check vports are valid])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- valid_vport], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- valid_vport], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([check client rings are found])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_client_lookup], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_client_lookup], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([check kni fifos are found])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_kni_lookup], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_kni_lookup], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([check packet mempool is found])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- lookup_packet_mempool], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- lookup_packet_mempool], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ AT_SETUP([check port names are valid])
+-AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- is_vport_name_valid], [0], [ignore], [])
++AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- is_vport_name_valid], [0], [ignore], [])
+ AT_CLEANUP
+ 
+ ])
+-- 
+1.8.5.2
+