diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 13:48:23 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 13:48:23 +0200 |
commit | 1b6242fc583a6b871304fb995af6dc211b58f69b (patch) | |
tree | b5d434d90dedae24792906aa304897c23a134386 /recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch | |
download | meta-ip-1b6242fc583a6b871304fb995af6dc211b58f69b.tar.gz |
initial commit for Enea Linux 4.0daisy-enea
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch')
-rw-r--r-- | recipes-networking/openvswitchdpdk/files/0001-openvswitchdpdk-enabled-ptest.patch | 380 |
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 @@ | |||
1 | From 1ea34b3e5bf1d386b9931f11dee89bc03f224852 Mon Sep 17 00:00:00 2001 | ||
2 | From: Radu Patriu <radu.patriu@enea.com> | ||
3 | Date: Tue, 6 May 2014 13:02:10 +0000 | ||
4 | Subject: [PATCH] openvswitchdpdk: enabled ptest | ||
5 | |||
6 | Signed-off-by: Radu Patriu <radu.patriu@enea.com> | ||
7 | --- | ||
8 | openvswitch/Makefile.am | 1 + | ||
9 | openvswitch/test.mk | 47 ++++++++++++++++++++++++++++++++++++ | ||
10 | openvswitch/tests/dpdk-datapath.at | 48 ++++++++++++++++++------------------- | ||
11 | openvswitch/tests/dpdk-link.at | 2 +- | ||
12 | openvswitch/tests/dpif-dpdk.at | 30 +++++++++++------------ | ||
13 | openvswitch/tests/flowgen.pl | 0 | ||
14 | openvswitch/tests/netdev-dpdk.at | 2 +- | ||
15 | openvswitch/tests/ofproto-macros.at | 2 +- | ||
16 | openvswitch/tests/ovs-vport.at | 10 ++++---- | ||
17 | 9 files changed, 95 insertions(+), 47 deletions(-) | ||
18 | create mode 100644 openvswitch/test.mk | ||
19 | mode change 100644 => 100755 openvswitch/tests/flowgen.pl | ||
20 | |||
21 | diff --git a/openvswitch/Makefile.am b/openvswitch/Makefile.am | ||
22 | index d0edfa2..107ca89 100644 | ||
23 | --- a/openvswitch/Makefile.am | ||
24 | +++ b/openvswitch/Makefile.am | ||
25 | @@ -311,3 +311,4 @@ include xenserver/automake.mk | ||
26 | include python/automake.mk | ||
27 | include python/compat/automake.mk | ||
28 | include tutorial/automake.mk | ||
29 | +include test.mk | ||
30 | \ No newline at end of file | ||
31 | diff --git a/openvswitch/test.mk b/openvswitch/test.mk | ||
32 | new file mode 100644 | ||
33 | index 0000000..10f3629 | ||
34 | --- /dev/null | ||
35 | +++ b/openvswitch/test.mk | ||
36 | @@ -0,0 +1,47 @@ | ||
37 | +TEST_DEST ?= ${prefix}/lib/openvswitchdpdk/ptest | ||
38 | +TEST_ROOT ?= ${prefix}/lib/openvswitchdpdk/ptest | ||
39 | +TEST_DEPEND = | ||
40 | + | ||
41 | +if HAVE_OPENSSL | ||
42 | +TEST_DEPEND += $(TESTPKI_FILES) | ||
43 | +endif | ||
44 | + | ||
45 | +test-install: $(TEST_DEPEND) | ||
46 | + @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\ | ||
47 | + install -d $(TEST_DEST)/tests ;\ | ||
48 | + install -d $(TEST_DEST)/python ;\ | ||
49 | + install -d $(TEST_DEST)/python/ovs ;\ | ||
50 | + install -d $(TEST_DEST)/python/ovs/db ;\ | ||
51 | + install -d $(TEST_DEST)/python/ovs/unixctl ;\ | ||
52 | + install -d $(TEST_DEST)/vswitchd ;\ | ||
53 | + install vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\ | ||
54 | + install -d $(TEST_DEST)/debian ;\ | ||
55 | + install debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\ | ||
56 | + install -d $(TEST_DEST)/build-aux ;\ | ||
57 | + install build-aux/check-structs $(TEST_DEST)/build-aux ;\ | ||
58 | + install -d $(TEST_DEST)/xenserver ;\ | ||
59 | + install xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\ | ||
60 | + install xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\ | ||
61 | + install xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\ | ||
62 | + install xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\ | ||
63 | + install xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\ | ||
64 | + for p in $$list ; do \ | ||
65 | + echo $$p ;\ | ||
66 | + p=$${p#./} ;\ | ||
67 | + pre=$${p#tests\/} ;\ | ||
68 | + if test $$pre != $$p ; then \ | ||
69 | + echo installing $$p to $(TEST_DEST)/tests/$$pre ;\ | ||
70 | + install $$p $(TEST_DEST)/tests/$$pre ;\ | ||
71 | + continue ;\ | ||
72 | + fi ;\ | ||
73 | + pre=$${p#python\/ovs\/} ;\ | ||
74 | + if test $$pre != $$p ; then \ | ||
75 | + echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\ | ||
76 | + install $$p $(TEST_DEST)/python/ovs/$$pre ;\ | ||
77 | + continue ;\ | ||
78 | + fi; \ | ||
79 | + done ;\ | ||
80 | + sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig | ||
81 | + sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig | ||
82 | + sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig | ||
83 | + sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig | ||
84 | diff --git a/openvswitch/tests/dpdk-datapath.at b/openvswitch/tests/dpdk-datapath.at | ||
85 | index 5472ae3..16c5f3d 100644 | ||
86 | --- a/openvswitch/tests/dpdk-datapath.at | ||
87 | +++ b/openvswitch/tests/dpdk-datapath.at | ||
88 | @@ -28,47 +28,47 @@ | ||
89 | m4_define([OVDK_CHECK_ACTION_EXECUTE], | ||
90 | [AT_BANNER([action_execute unit tests - dpdk datapath]) | ||
91 | AT_SETUP([execute an output action]) | ||
92 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output], [0], [ignore], []) | ||
93 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output], [0], [ignore], []) | ||
94 | AT_CLEANUP | ||
95 | |||
96 | AT_SETUP([execute an output action with invalid parameters]) | ||
97 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__invalid_params], [0], [ignore], []) | ||
98 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__invalid_params], [0], [ignore], []) | ||
99 | AT_CLEANUP | ||
100 | |||
101 | AT_SETUP([execute a corrupt action]) | ||
102 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__corrupt_action], [0], [ignore], []) | ||
103 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_output__corrupt_action], [0], [ignore], []) | ||
104 | AT_CLEANUP | ||
105 | |||
106 | AT_SETUP([execute a drop action]) | ||
107 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_drop], [0], [ignore], []) | ||
108 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_drop], [0], [ignore], []) | ||
109 | AT_CLEANUP | ||
110 | |||
111 | AT_SETUP([execute a pop VLAN action]) | ||
112 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_pop_vlan], [0], [ignore], []) | ||
113 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_pop_vlan], [0], [ignore], []) | ||
114 | AT_CLEANUP | ||
115 | |||
116 | AT_SETUP([execute a set ethernet action]) | ||
117 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ethernet], [0], [ignore], []) | ||
118 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ethernet], [0], [ignore], []) | ||
119 | AT_CLEANUP | ||
120 | |||
121 | AT_SETUP([execute a set ipv4 action]) | ||
122 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ipv4], [0], [ignore], []) | ||
123 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_set_ipv4], [0], [ignore], []) | ||
124 | AT_CLEANUP | ||
125 | |||
126 | AT_SETUP([execute a push VLAN vid action]) | ||
127 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__vid], [0], [ignore], []) | ||
128 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__vid], [0], [ignore], []) | ||
129 | AT_CLEANUP | ||
130 | |||
131 | AT_SETUP([execute a push VLAN pcp action]) | ||
132 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__pcp], [0], [ignore], []) | ||
133 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_push_vlan__pcp], [0], [ignore], []) | ||
134 | AT_CLEANUP | ||
135 | |||
136 | AT_SETUP([execute multiple actions with three output actions]) | ||
137 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__three_output], [0], [ignore], []) | ||
138 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__three_output], [0], [ignore], []) | ||
139 | AT_CLEANUP | ||
140 | |||
141 | AT_SETUP([execute multiple actions with a pop vlan and output action]) | ||
142 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__pop_vlan_and_output], [0], [ignore], []) | ||
143 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- action_execute_multiple_actions__pop_vlan_and_output], [0], [ignore], []) | ||
144 | AT_CLEANUP | ||
145 | ]) | ||
146 | |||
147 | @@ -77,31 +77,31 @@ AT_CLEANUP | ||
148 | m4_define([OVDK_CHECK_FLOW_TABLE], | ||
149 | [AT_BANNER([flow table unit tests - dpdk datapath]) | ||
150 | AT_SETUP([add a flow to the flow table]) | ||
151 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_add_flow], [0], [ignore], []) | ||
152 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_add_flow], [0], [ignore], []) | ||
153 | AT_CLEANUP | ||
154 | |||
155 | AT_SETUP([delete a flow from the flow table]) | ||
156 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_flow], [0], [ignore], []) | ||
157 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_flow], [0], [ignore], []) | ||
158 | AT_CLEANUP | ||
159 | |||
160 | AT_SETUP([delete all flows from the flow table]) | ||
161 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_all], [0], [ignore], []) | ||
162 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_del_all], [0], [ignore], []) | ||
163 | AT_CLEANUP | ||
164 | |||
165 | AT_SETUP([get a flow from the flow table]) | ||
166 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_flow], [0], [ignore], []) | ||
167 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_flow], [0], [ignore], []) | ||
168 | AT_CLEANUP | ||
169 | |||
170 | AT_SETUP([modify a flow in the flow table]) | ||
171 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_mod_flow], [0], [ignore], []) | ||
172 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_mod_flow], [0], [ignore], []) | ||
173 | AT_CLEANUP | ||
174 | |||
175 | AT_SETUP([get the first flow from the flow table]) | ||
176 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_first_flow], [0], [ignore], []) | ||
177 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_first_flow], [0], [ignore], []) | ||
178 | AT_CLEANUP | ||
179 | |||
180 | AT_SETUP([get the next flow from the flow table]) | ||
181 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_next_flow], [0], [ignore], []) | ||
182 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- flow_table_get_next_flow], [0], [ignore], []) | ||
183 | AT_CLEANUP | ||
184 | ]) | ||
185 | |||
186 | @@ -110,27 +110,27 @@ AT_CLEANUP | ||
187 | m4_define([OVDK_CHECK_STATS], | ||
188 | [AT_BANNER([stats unit tests - dpdk datapath]) | ||
189 | AT_SETUP([increment stats for all vports]) | ||
190 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_increment], [0], [ignore], []) | ||
191 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_increment], [0], [ignore], []) | ||
192 | AT_CLEANUP | ||
193 | |||
194 | AT_SETUP([get stats for all vports]) | ||
195 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_get], [0], [ignore], []) | ||
196 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_get], [0], [ignore], []) | ||
197 | AT_CLEANUP | ||
198 | |||
199 | AT_SETUP([clear stats for all vports]) | ||
200 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_clear], [0], [ignore], []) | ||
201 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vport_xxx_clear], [0], [ignore], []) | ||
202 | AT_CLEANUP | ||
203 | |||
204 | AT_SETUP([increment stats for the vswitch]) | ||
205 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_increment], [0], [ignore], []) | ||
206 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_increment], [0], [ignore], []) | ||
207 | AT_CLEANUP | ||
208 | |||
209 | AT_SETUP([get stats for the vswitch]) | ||
210 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_get], [0], [ignore], []) | ||
211 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_get], [0], [ignore], []) | ||
212 | AT_CLEANUP | ||
213 | |||
214 | AT_SETUP([clear stats for the vswitch]) | ||
215 | -AT_CHECK([sudo -E $srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_clear], [0], [ignore], []) | ||
216 | +AT_CHECK([$srcdir/dpdk/test-datapath -c 1 -n 4 -- stats_vswitch_clear], [0], [ignore], []) | ||
217 | AT_CLEANUP | ||
218 | ]) | ||
219 | |||
220 | diff --git a/openvswitch/tests/dpdk-link.at b/openvswitch/tests/dpdk-link.at | ||
221 | index accfde9..c119668 100644 | ||
222 | --- a/openvswitch/tests/dpdk-link.at | ||
223 | +++ b/openvswitch/tests/dpdk-link.at | ||
224 | @@ -29,7 +29,7 @@ | ||
225 | m4_define([CHECK_DPDK_LINK], | ||
226 | [AT_BANNER([dpdk-link tests]) | ||
227 | AT_SETUP([Check negative cases for dpdk-link.c]) | ||
228 | -AT_CHECK([sudo -E $srcdir/test-dpdk-link -c 1 -n 4], [0], [ignore], []) | ||
229 | +AT_CHECK([$srcdir/test-dpdk-link -c 1 -n 4], [0], [ignore], []) | ||
230 | AT_CLEANUP | ||
231 | ]) | ||
232 | |||
233 | diff --git a/openvswitch/tests/dpif-dpdk.at b/openvswitch/tests/dpif-dpdk.at | ||
234 | index 55b3505..b62d146 100644 | ||
235 | --- a/openvswitch/tests/dpif-dpdk.at | ||
236 | +++ b/openvswitch/tests/dpif-dpdk.at | ||
237 | @@ -2,63 +2,63 @@ m4_define([CHECK_DPIF_DPDK], | ||
238 | |||
239 | [AT_BANNER([Test dpif-dpdk.c ]) | ||
240 | AT_SETUP([Test dpif_dpdk_get_stats]) | ||
241 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_stats], [0], [ignore], []) | ||
242 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_stats], [0], [ignore], []) | ||
243 | AT_CLEANUP | ||
244 | |||
245 | AT_SETUP([Test dpif_dpdk_port_add]) | ||
246 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_add], [0], [ignore], [ignore]) | ||
247 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_add], [0], [ignore], [ignore]) | ||
248 | AT_CLEANUP | ||
249 | |||
250 | AT_SETUP([Test dpif_dpdk_port_del]) | ||
251 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_del], [0], [ignore], []) | ||
252 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_del], [0], [ignore], []) | ||
253 | AT_CLEANUP | ||
254 | |||
255 | AT_SETUP([Test dpif_dpdk_port_query_by_number]) | ||
256 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_number], [0], [ignore], [ignore]) | ||
257 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_number], [0], [ignore], [ignore]) | ||
258 | AT_CLEANUP | ||
259 | |||
260 | AT_SETUP([Test dpif_dpdk_port_query_by_name]) | ||
261 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_name], [0], [ignore], [ignore]) | ||
262 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_query_by_name], [0], [ignore], [ignore]) | ||
263 | AT_CLEANUP | ||
264 | |||
265 | AT_SETUP([Test dpif_dpdk_get_max_ports]) | ||
266 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_max_ports], [0], [ignore], []) | ||
267 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_get_max_ports], [0], [ignore], []) | ||
268 | AT_CLEANUP | ||
269 | |||
270 | AT_SETUP([Test dpif_dpdk_port_dump_start]) | ||
271 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_start], [0], [ignore], []) | ||
272 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_start], [0], [ignore], []) | ||
273 | AT_CLEANUP | ||
274 | |||
275 | AT_SETUP([Test dpif_dpdk_port_dump_next]) | ||
276 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_next], [0], [ignore], []) | ||
277 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_next], [0], [ignore], []) | ||
278 | AT_CLEANUP | ||
279 | |||
280 | AT_SETUP([Test dpif_dpdk_port_dump_done]) | ||
281 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_done], [0], [ignore], []) | ||
282 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_dump_done], [0], [ignore], []) | ||
283 | AT_CLEANUP | ||
284 | |||
285 | AT_SETUP([Test dpif_dpdk_port_poll]) | ||
286 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll], [0], [ignore], []) | ||
287 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll], [0], [ignore], []) | ||
288 | AT_CLEANUP | ||
289 | |||
290 | AT_SETUP([Test dpif_dpdk_port_poll_wait]) | ||
291 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll_wait], [0], [ignore], []) | ||
292 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_port_poll_wait], [0], [ignore], []) | ||
293 | AT_CLEANUP | ||
294 | |||
295 | AT_SETUP([Test dpif_dpdk_flow_put]) | ||
296 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_put], [0], [ignore], []) | ||
297 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_put], [0], [ignore], []) | ||
298 | AT_CLEANUP | ||
299 | |||
300 | AT_SETUP([Test dpif_dpdk_flow_del]) | ||
301 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_del], [0], [ignore], []) | ||
302 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_del], [0], [ignore], []) | ||
303 | AT_CLEANUP | ||
304 | |||
305 | AT_SETUP([Test dpif_dpdk_flow_dump_start]) | ||
306 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_start], [0], [ignore], []) | ||
307 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_start], [0], [ignore], []) | ||
308 | AT_CLEANUP | ||
309 | |||
310 | AT_SETUP([Test dpif_dpdk_flow_dump_next]) | ||
311 | -AT_CHECK([sudo -E $srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_next], [0], [ignore], []) | ||
312 | +AT_CHECK([$srcdir/test-dpif-dpdk -c 1 -n 4 -- --dpif_dpdk_flow_dump_next], [0], [ignore], []) | ||
313 | AT_CLEANUP | ||
314 | ]) | ||
315 | CHECK_DPIF_DPDK([]) | ||
316 | diff --git a/openvswitch/tests/flowgen.pl b/openvswitch/tests/flowgen.pl | ||
317 | old mode 100644 | ||
318 | new mode 100755 | ||
319 | diff --git a/openvswitch/tests/netdev-dpdk.at b/openvswitch/tests/netdev-dpdk.at | ||
320 | index df4cd89..d314e3c 100644 | ||
321 | --- a/openvswitch/tests/netdev-dpdk.at | ||
322 | +++ b/openvswitch/tests/netdev-dpdk.at | ||
323 | @@ -3,7 +3,7 @@ m4_define([CHECK_DPIF_DPDK], | ||
324 | [AT_BANNER([Test netdev-dpdk.c ]) | ||
325 | |||
326 | AT_SETUP([Test netdev_dpdk_change_seq]) | ||
327 | -AT_CHECK([sudo -E $srcdir/test-netdev-dpdk --netdev_dpdk_test_change_seq], [0], [ignore], []) | ||
328 | +AT_CHECK([$srcdir/test-netdev-dpdk --netdev_dpdk_test_change_seq], [0], [ignore], []) | ||
329 | AT_CLEANUP | ||
330 | |||
331 | ]) | ||
332 | diff --git a/openvswitch/tests/ofproto-macros.at b/openvswitch/tests/ofproto-macros.at | ||
333 | index 839d41f..ef291dd 100644 | ||
334 | --- a/openvswitch/tests/ofproto-macros.at | ||
335 | +++ b/openvswitch/tests/ofproto-macros.at | ||
336 | @@ -73,7 +73,7 @@ m4_define([OVS_VSWITCHD_START], | ||
337 | AT_CHECK([ovs-vsctl --no-wait init]) | ||
338 | |||
339 | dnl Start ovs-vswitchd. | ||
340 | - AT_CHECK([ovs-vswitchd --detach --no-chdir --pidfile --enable-dummy$3 --disable-system --log-file -vvconn -vofproto_dpif], [0], [], [stderr]) | ||
341 | + 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]) | ||
342 | AT_CAPTURE_FILE([ovs-vswitchd.log]) | ||
343 | AT_CHECK([[sed < stderr ' | ||
344 | /vlog|INFO|opened log file/d | ||
345 | diff --git a/openvswitch/tests/ovs-vport.at b/openvswitch/tests/ovs-vport.at | ||
346 | index 5f6857c..19d87cc 100644 | ||
347 | --- a/openvswitch/tests/ovs-vport.at | ||
348 | +++ b/openvswitch/tests/ovs-vport.at | ||
349 | @@ -6,23 +6,23 @@ m4_define([OVDK_CHECK_LIBVPORT], | ||
350 | [AT_BANNER([libvport/ovs-vport unit tests - dpdk datapath]) | ||
351 | |||
352 | AT_SETUP([check vports are valid]) | ||
353 | -AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- valid_vport], [0], [ignore], []) | ||
354 | +AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- valid_vport], [0], [ignore], []) | ||
355 | AT_CLEANUP | ||
356 | |||
357 | AT_SETUP([check client rings are found]) | ||
358 | -AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_client_lookup], [0], [ignore], []) | ||
359 | +AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_client_lookup], [0], [ignore], []) | ||
360 | AT_CLEANUP | ||
361 | |||
362 | AT_SETUP([check kni fifos are found]) | ||
363 | -AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_kni_lookup], [0], [ignore], []) | ||
364 | +AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- vport_kni_lookup], [0], [ignore], []) | ||
365 | AT_CLEANUP | ||
366 | |||
367 | AT_SETUP([check packet mempool is found]) | ||
368 | -AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- lookup_packet_mempool], [0], [ignore], []) | ||
369 | +AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- lookup_packet_mempool], [0], [ignore], []) | ||
370 | AT_CLEANUP | ||
371 | |||
372 | AT_SETUP([check port names are valid]) | ||
373 | -AT_CHECK([sudo -E $srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- is_vport_name_valid], [0], [ignore], []) | ||
374 | +AT_CHECK([$srcdir/dpdk/test-ovs-vport -c 1 -n 4 -- is_vport_name_valid], [0], [ignore], []) | ||
375 | AT_CLEANUP | ||
376 | |||
377 | ]) | ||
378 | -- | ||
379 | 1.8.5.2 | ||
380 | |||