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 F0B9CA04B7; Mon, 7 Sep 2020 13:11:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E5B051C0CF; Mon, 7 Sep 2020 13:11:30 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id CACDB1C10C for ; Mon, 7 Sep 2020 13:11:28 +0200 (CEST) IronPort-SDR: 7kCCfR+avdFYJOjAysx7qVukrOgckGfoGjB7dpMll3IdWz61QBh3ip9bY02/+7rlPMcBdFgRQs rnJ80oZa8IFg== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197528" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197528" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2020 04:11:28 -0700 IronPort-SDR: o5eFjMi5oHfo1g79vFgWeLlwa3tHXtlU7fT02DPfbhY+lKOhC5PzuhLLeSdi1/Bj+Snd2jsJ1p 7WnSLJfKogyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841851" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:27 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:32 +0800 Message-Id: <20200907111035.7697-7-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200907111035.7697-1-yux.jiang@intel.com> References: <20200907111035.7697-1-yux.jiang@intel.com> Subject: [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build 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" From: "Jiang,yu" adapt to support both meson and makefile build Signed-off-by: Jiang,yu --- tests/TestSuite_virtio_ipsec_cryptodev_func.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/TestSuite_virtio_ipsec_cryptodev_func.py b/tests/TestSuite_virtio_ipsec_cryptodev_func.py index 8231d0f..fd79aa3 100644 --- a/tests/TestSuite_virtio_ipsec_cryptodev_func.py +++ b/tests/TestSuite_virtio_ipsec_cryptodev_func.py @@ -44,8 +44,8 @@ from packet import Packet class VirtioCryptodevIpsecTest(TestCase): def set_up_all(self): - self.sample_app = "./examples/vhost_crypto/build/vhost-crypto" - self.user_app = "./examples/ipsec-secgw/build/ipsec-secgw " + self.sample_app = self.dut.apps_name['vhost_crypto'] + self.user_app = self.dut.apps_name['ipsec-secgw'] self._default_ipsec_gw_opts = { "p": "0x3", "config": None, @@ -79,7 +79,7 @@ class VirtioCryptodevIpsecTest(TestCase): self.dut.skip_setup = False cc.build_dpdk_with_cryptodev(self) cc.bind_qat_device(self) - self.build_vhost_app() + self.dut.build_dpdk_apps("./examples/vhost_crypto") self.bind_vfio_pci() self.launch_vhost_switch() @@ -98,17 +98,8 @@ class VirtioCryptodevIpsecTest(TestCase): "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30) user_dut.send_expect( "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30) - out = user_dut.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (user_dut.number_of_cores, self.target), "# ", 1200) - #user_dut.build_install_dpdk(self.target) - out = user_dut.build_dpdk_apps("./examples/ipsec-secgw") - self.logger.info(out) - self.verify("Error" not in out, "Compilation error 1") - self.verify("No such" not in out, "Compilation error 2") - - def build_vhost_app(self): - out = self.dut.build_dpdk_apps("./examples/vhost_crypto") - self.verify("Error" not in out, "Compilation error 1") - self.verify("No such" not in out, "Compilation error 2") + user_dut.build_install_dpdk(self.target) + user_dut.build_dpdk_apps("./examples/ipsec-secgw") def get_vhost_eal(self): default_eal_opts = { @@ -374,7 +365,8 @@ class VirtioCryptodevIpsecTest(TestCase): self.vm1 = None self.dut_execut_cmd("^C", "# ") - self.dut_execut_cmd("killall -s INT vhost-crypto") + self.app_name = self.sample_app[self.sample_app.rfind('/')+1:] + self.dut.send_expect("killall -s INT %s" % self.app_name, "#") self.dut_execut_cmd("killall -s INT qemu-system-x86_64") self.dut_execut_cmd("rm -r /tmp/*") -- 2.7.4