From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8A965A0613 for ; Thu, 29 Aug 2019 09:12:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F8D21D166; Thu, 29 Aug 2019 09:12:55 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 6A7DA1D170 for ; Thu, 29 Aug 2019 09:12:54 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2019 00:12:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,442,1559545200"; d="scan'208";a="210440191" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by fmsmga002.fm.intel.com with ESMTP; 29 Aug 2019 00:12:53 -0700 From: "zhu,shuai" To: dts@dpdk.org Cc: yinan.wang@intel.com, "zhu,shuai" Date: Thu, 29 Aug 2019 15:16:52 +0800 Message-Id: <1567063015-92659-12-git-send-email-shuaix.zhu@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1567063015-92659-1-git-send-email-shuaix.zhu@intel.com> References: <1567063015-92659-1-git-send-email-shuaix.zhu@intel.com> Subject: [dts] [PATCH V1 12/15] tests/vdev_primary_secondary:Change the relative path to an absolute path. X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Change the relative path to an absolute path. Signed-off-by: zhu,shuai --- tests/TestSuite_vdev_primary_secondary.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_vdev_primary_secondary.py b/tests/TestSuite_vdev_primary_secondary.py index 6f8f235..fdffa09 100644 --- a/tests/TestSuite_vdev_primary_secondary.py +++ b/tests/TestSuite_vdev_primary_secondary.py @@ -62,12 +62,13 @@ class TestVdevPrimarySecondary(TestCase): cores = self.dut.get_core_list("1S/12C/1T", socket=self.ports_socket) self.coremask = utils.create_mask(cores) self.verify(len(self.coremask) >= 6, "The machine has too few cores.") + self.base_dir = self.dut.base_dir.replace('~', '/root') def set_up(self): """ Run before each test case. """ - self.dut.send_expect("rm -rf ./vhost-net*", "#") + self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#") self.dut.send_expect("killall -s INT testpmd", "#") self.dut.send_expect("killall -s INT qemu-system-x86_64", "#") @@ -81,7 +82,7 @@ class TestVdevPrimarySecondary(TestCase): for i in range(self.queues): vm_params = {} vm_params['driver'] = 'vhost-user' - vm_params['opt_path'] = './vhost-net%d' % i + vm_params['opt_path'] = self.base_dir + '/vhost-net%d' % i vm_params['opt_mac'] = "%s%d" % (self.virtio_mac, i+2) vm_params['opt_queue'] = self.queues vm_params['opt_server'] = 'server' @@ -103,10 +104,10 @@ class TestVdevPrimarySecondary(TestCase): launch testpmd """ cmd = "./%s/app/testpmd -l 1-6 -n %d --socket-mem 2048,2048 --legacy-mem --file-prefix=vhost" + \ - " --vdev 'net_vhost0,iface=vhost-net0,queues=%d,client=1'" + \ - " --vdev 'net_vhost1,iface=vhost-net1,queues=%d,client=1'" + \ + " --vdev 'net_vhost0,iface=%s/vhost-net0,queues=%d,client=1'" + \ + " --vdev 'net_vhost1,iface=%s/vhost-net1,queues=%d,client=1'" + \ " -- -i --nb-cores=4 --rxq=%d --txq=%d --txd=1024 --rxd=1024" - start_cmd = cmd % (self.target, self.mem_channels, self.queues, self.queues, self.queues, self.queues) + start_cmd = cmd % (self.target, self.mem_channels, self.base_dir, self.queues, self.base_dir, self.queues, self.queues, self.queues) self.dut.send_expect(start_cmd, "testpmd> ", 120) self.dut.send_expect("set fwd txonly", "testpmd> ", 120) self.dut.send_expect("start", "testpmd> ", 120) -- 2.17.2