From cdba631d32461d5f5916b369a9007a63891c55a6 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Wed, 13 Apr 2016 14:26:07 +0100 Subject: vm: use the same testpmd sources inside VM Always copy testpmd sources from the directory with vHost User version of DPDK. This will avoid possible issues with missing dependencies in some VM images. It will also ensure, that testpmd inside VM is agnostic to chosen vHost method. Change-Id: I0496cc846eff3f7d4c1aef0a9c825545a4c3c818 JIRA: VSPERF-283 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Brian Castelli --- testcases/testcase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'testcases') diff --git a/testcases/testcase.py b/testcases/testcase.py index ff1247fc..7c935792 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -309,8 +309,10 @@ class TestCase(object): # copy sources into shared dir only if neccessary if 'testpmd' in self.guest_loopback or 'l2fwd' in self.guest_loopback: try: + # always use DPDK vhost user version inside VM, so results are not + # affected by different testpmd behavior inside VM tasks.run_task(['rsync', '-a', '-r', '-l', r'--exclude="\.git"', - os.path.join(S.getValue('RTE_SDK'), ''), + os.path.join(S.getValue('RTE_SDK_USER'), ''), os.path.join(guest_dir, 'DPDK')], self._logger, 'Copying DPDK to shared directory...', -- cgit 1.2.3-korg