From patchwork Mon Sep 7 11:10:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76677 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BAD5A04DB; Mon, 7 Sep 2020 13:11:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1064D1C0D1; Mon, 7 Sep 2020 13:11:23 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id DB5971BE0C for ; Mon, 7 Sep 2020 13:11:20 +0200 (CEST) IronPort-SDR: shTZw5nSSokfaeAZDEybm/JVV7OpsJcM2whxTyrYa1D9ZVjJJerENiJd5AKGpgw6UcJR5Mwygc fQ1XVPvJv2Wg== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197508" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197508" 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:20 -0700 IronPort-SDR: aoMQ4aMj6Qqlp/2Tk4ol2w2XeBN4PWXp81URlX/tXzlORkw8gB4IdMAMV3A9/BRf1UMJelFRbF Xem7gmdHs/6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841780" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:19 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:27 +0800 Message-Id: <20200907111035.7697-2-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 1/9] tests/TestSuite_crypto_perf_cryptodev_perf: 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_crypto_perf_cryptodev_perf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/TestSuite_crypto_perf_cryptodev_perf.py b/tests/TestSuite_crypto_perf_cryptodev_perf.py index fb9f2e0..b8d6242 100644 --- a/tests/TestSuite_crypto_perf_cryptodev_perf.py +++ b/tests/TestSuite_crypto_perf_cryptodev_perf.py @@ -69,8 +69,7 @@ class PerfTestsCryptodev(TestCase): "digest-sz": None, "csv-friendly": None } - self._app_path = "./x86_64-native-linuxapp-gcc/build/app/test-crypto-perf/dpdk-test-crypto-perf" - + self._app_path = self.dut.apps_name['test-crypto-perf'] page_size = self.dut.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ") if int(page_size) == 1024 * 1024: self.dut.send_expect('echo 0 > /sys/kernel/mm/hugepages/hugepages-%skB/nr_hugepages' % (page_size), '# ', 5) From patchwork Mon Sep 7 11:10:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76678 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49CE7A04B7; Mon, 7 Sep 2020 13:11:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 411BF1C0D7; Mon, 7 Sep 2020 13:11:24 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 7B2C01BE0C for ; Mon, 7 Sep 2020 13:11:22 +0200 (CEST) IronPort-SDR: xPmB4xY94q04PqqCFlfcQ6jJ2qLKSz47vhXS4lyD2/28wOuHguBCQEh4Zm1jYlDA1glCvwHQXa O67gBcvbS9/w== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197510" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197510" 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:22 -0700 IronPort-SDR: XIbDskflJ1prNxUMqsQW9HwBGptIcqQSXx0DP13Pcl43zyYF2QHtW70+jgYpB4rtz7K/k3IEBb s8aQXTZQ8MpA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841796" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:20 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:28 +0800 Message-Id: <20200907111035.7697-3-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 2/9] tests/TestSuite_fips_cryptodev: 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_fips_cryptodev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_fips_cryptodev.py b/tests/TestSuite_fips_cryptodev.py index aab2167..8c75d54 100644 --- a/tests/TestSuite_fips_cryptodev.py +++ b/tests/TestSuite_fips_cryptodev.py @@ -45,7 +45,7 @@ class FipCryptodev(TestCase): self.verify("No such"not in out,"Compilation error") self.vf_driver = self.get_suite_cfg()['vf_driver'] cc.bind_qat_device(self, "vfio-pci") - self._app_path = "./examples/fips_validation/build/fips_validation" + self._app_path = self.dut.apps_name['fips_validation'] self._default_fips_opts = { "req-file": None, "rsp-file": None, From patchwork Mon Sep 7 11:10:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76679 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72EC2A04B7; Mon, 7 Sep 2020 13:11:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6C35E1C0D5; Mon, 7 Sep 2020 13:11:25 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 10BEB1BE0C for ; Mon, 7 Sep 2020 13:11:23 +0200 (CEST) IronPort-SDR: Ih9w4V3pGD7/I3rBOpQNsye862uP94RWH2gdd4C2e8HhN9bIFq3Mz6zyTNcHglYAJp3WRNd6FL yRHEOjzEHYPA== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197514" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197514" 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:23 -0700 IronPort-SDR: 3O3uHKyGV+c7T7MsoN4nVasIUa1C93AoqwgN8nOtChUTfsYRvQrfVv2rL+L0qCnm4u24ZGvXhS RzfDrjAaAqkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841808" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:22 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:29 +0800 Message-Id: <20200907111035.7697-4-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 3/9] tests/TestSuite_ipsec_gw_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_ipsec_gw_cryptodev_func.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_ipsec_gw_cryptodev_func.py b/tests/TestSuite_ipsec_gw_cryptodev_func.py index de123dc..538b939 100644 --- a/tests/TestSuite_ipsec_gw_cryptodev_func.py +++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py @@ -69,7 +69,7 @@ class TestIPsecGW(TestCase): self.logger.info("tx interface = " + self.tx_interface) self.logger.info("rx interface = " + self.rx_interface) - self._app_path = "./examples/ipsec-secgw/build/ipsec-secgw" + self._app_path = self.dut.apps_name['ipsec-secgw'] if not cc.is_build_skip(self): cc.build_dpdk_with_cryptodev(self) out =self.dut.build_dpdk_apps("./examples/ipsec-secgw") From patchwork Mon Sep 7 11:10:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76680 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99284A04B7; Mon, 7 Sep 2020 13:11:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 923BF1C0DC; Mon, 7 Sep 2020 13:11:26 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id B2B821C0DC for ; Mon, 7 Sep 2020 13:11:25 +0200 (CEST) IronPort-SDR: cv3g1/njaTPf6MhWPUSzfT+OxpwTo9O80cHmzE2F87UiXu/iEumOm3N7nOQoLcOQJJc85tNxFn ALkc5jN4dmgw== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197518" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197518" 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:25 -0700 IronPort-SDR: bOXbuhHDNZsUwz/TRCRtnOYqAa3wbGpoN7mZbozIyzFZvRN+SqwCIHNGC01PfYL2JxHpB49BfE Yelk927FkaLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841824" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:23 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:30 +0800 Message-Id: <20200907111035.7697-5-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 4/9] tests/TestSuite_l2fwd_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_l2fwd_cryptodev_func.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py index a40956e..664aa14 100644 --- a/tests/TestSuite_l2fwd_cryptodev_func.py +++ b/tests/TestSuite_l2fwd_cryptodev_func.py @@ -79,7 +79,7 @@ class TestL2fwdCrypto(TestCase): self.logger.info("tx interface = " + self.tx_interface) self.logger.info("rx interface = " + self.rx_interface) - self._app_path = "./examples/l2fwd-crypto/build/l2fwd-crypto" + self._app_path = self.dut.apps_name['l2fwd-crypto'] if not cc.is_build_skip(self): cc.build_dpdk_with_cryptodev(self) From patchwork Mon Sep 7 11:10:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76681 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C23B1A04B7; Mon, 7 Sep 2020 13:11:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BA7031C0D0; Mon, 7 Sep 2020 13:11:28 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 4A0151BE0C for ; Mon, 7 Sep 2020 13:11:27 +0200 (CEST) IronPort-SDR: kFDlJm+aRjubFQKM3mJNDSTKHYlEcfMUveBF2FVzh+tgtgetYuGurZbmH5iOMH055lR8mpbl0s gboz0M3rverA== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197525" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197525" 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:26 -0700 IronPort-SDR: TtIaLSDTu3sZMI1p5cVCb+IGLEpC0sFtWFfrkK/IloFZKl4JBE6k6BKJbFC/zmufVtIpMbJHBW jD66DYBu5sYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841839" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:25 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:31 +0800 Message-Id: <20200907111035.7697-6-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 5/9] tests/TestSuite_unit_tests_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_unit_tests_cryptodev_func.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite_unit_tests_cryptodev_func.py index e990192..fdc1398 100644 --- a/tests/TestSuite_unit_tests_cryptodev_func.py +++ b/tests/TestSuite_unit_tests_cryptodev_func.py @@ -39,7 +39,7 @@ import cryptodev_common as cc class UnitTestsCryptodev(TestCase): def set_up_all(self): - self._app_path = "./{target}/app/test".format(target=self.dut.target) + self._app_path = self.dut.apps_name['test'] if not cc.is_build_skip(self): cc.build_dpdk_with_cryptodev(self) cc.bind_qat_device(self, "vfio-pci") From patchwork Mon Sep 7 11:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76682 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org 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/*") From patchwork Mon Sep 7 11:10:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76683 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1FFDFA04B7; Mon, 7 Sep 2020 13:11:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 18B121C0DB; Mon, 7 Sep 2020 13:11:32 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 92D861BE0C for ; Mon, 7 Sep 2020 13:11:30 +0200 (CEST) IronPort-SDR: r9BUGvi4zJKi1DO/HIxsmxJl+iPQ7kN+W1p6RdaZ26RiJFEofvxDbNk/oZKI1KAPRLruqWozzH DDRfJ6XONJGw== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197531" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197531" 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:30 -0700 IronPort-SDR: 0+r2Wmj+hmKuYdML5e9wn/Qaq1HVN+7AEEBdJX48ULGgFuYjl/zrsgNprQKEJ+gE9z7+3htzKz ZhaLr98o65zA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841869" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:28 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:33 +0800 Message-Id: <20200907111035.7697-8-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 7/9] tests/TestSuite_virtio_perf_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_perf_cryptodev_func.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py index 5323fc6..5126a06 100644 --- a/tests/TestSuite_virtio_perf_cryptodev_func.py +++ b/tests/TestSuite_virtio_perf_cryptodev_func.py @@ -41,8 +41,8 @@ import cryptodev_common as cc class VirtioCryptodevPerfTest(TestCase): def set_up_all(self): - self.sample_app = "./examples/vhost_crypto/build/vhost-crypto" - self.user_app = "./{target}/build/app/test-crypto-perf/dpdk-test-crypto-perf".format(target=self.dut.target) + self.sample_app = self.dut.apps_name['vhost_crypto'] + self.user_app = self.dut.apps_name['test-crypto-perf'] self._default_crypto_perf_opts = { "ptest": "throughput", "silent": "", @@ -85,7 +85,7 @@ class VirtioCryptodevPerfTest(TestCase): if not cc.is_build_skip(self): self.dut.skip_setup = False cc.build_dpdk_with_cryptodev(self) - self.build_vhost_app() + self.dut.build_dpdk_apps("./examples/vhost_crypto") cc.bind_qat_device(self) self.vf_assign_method = "vfio-pci" @@ -119,16 +119,7 @@ class VirtioCryptodevPerfTest(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), "# ", 900) - - self.verify("Error" not in out, "compilation error 1") - self.verify("No such file" not in out, "compilation error 2") - - def build_vhost_app(self): - out = self.dut_execut_cmd("make -C ./examples/vhost_crypto") - - self.verify("Error" not in out, "compilation error 1") - self.verify("No such file" not in out, "compilation error 2") + user_dut.build_install_dpdk(self.target) def get_vhost_eal(self): default_eal_opts = { @@ -260,7 +251,8 @@ class VirtioCryptodevPerfTest(TestCase): self.used_dut_port = 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/*") cc.clear_dpdk_config(self) From patchwork Mon Sep 7 11:10:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76684 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64530A04B7; Mon, 7 Sep 2020 13:11:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4276D1C0CC; Mon, 7 Sep 2020 13:11:34 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id EC1D71BE0C for ; Mon, 7 Sep 2020 13:11:31 +0200 (CEST) IronPort-SDR: 7Gy/2lWH3u5RwIBcQMtwHKRfriBai3fcz0OCLPDvFNhPc3qP9WCick2FICzyWK49fz6QmDO4Wm ROkY9auRiBXw== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197533" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197533" 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:31 -0700 IronPort-SDR: jBqifuTOKKn+tzZ+ScRIbmiIiYHrAmnYGZyO/DUJXVehI0gXy1ejXhNTh+uNcgX9aguaHEgtci FFOy0vpSFGKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841879" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:30 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:34 +0800 Message-Id: <20200907111035.7697-9-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 8/9] tests/TestSuite_virtio_unit_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_unit_cryptodev_func.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py index d8f56e2..336af7a 100644 --- a/tests/TestSuite_virtio_unit_cryptodev_func.py +++ b/tests/TestSuite_virtio_unit_cryptodev_func.py @@ -43,8 +43,8 @@ import cryptodev_common as cc class VirtioCryptodevUnitTest(TestCase): def set_up_all(self): - self.sample_app= "./examples/vhost_crypto/build/vhost-crypto" - self.user_app = "./{target}/app/test".format(target=self.dut.target) + self.sample_app = self.dut.apps_name['vhost_crypto'] + self.user_app = self.dut.apps_name['test'] self.vm0, self.vm0_dut = None, None self.dut.skip_setup = True @@ -58,7 +58,7 @@ class VirtioCryptodevUnitTest(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.vf_assign_method = "vfio-pci" self.dut.setup_modules(None, self.vf_assign_method, None) @@ -86,12 +86,6 @@ class VirtioCryptodevUnitTest(TestCase): def dut_execut_cmd(self, cmdline, ex='#', timout=30): return self.dut.send_expect(cmdline, ex, timout) - def build_vhost_app(self): - out = self.dut_execut_cmd("make -C ./examples/vhost_crypto") - - self.verify("Error" not in out, "compilation error 1") - self.verify("No such file" not in out, "compilation error 2") - def get_vhost_eal(self): default_eal_opts = { "c": None, @@ -202,7 +196,8 @@ class VirtioCryptodevUnitTest(TestCase): self.used_dut_port = 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/*") From patchwork Mon Sep 7 11:10:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 76685 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 95799A04DB; Mon, 7 Sep 2020 13:11:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F0DA1C112; Mon, 7 Sep 2020 13:11:34 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 57F571BE0C for ; Mon, 7 Sep 2020 13:11:33 +0200 (CEST) IronPort-SDR: mdHx/OA1Y1+mnGEfbHrXXHLDbwQf7zrB8nlOc995I2IYkoU54raPcl3WyndKc0ZRxtwqU00C7N fgPN+mVEZXTw== X-IronPort-AV: E=McAfee;i="6000,8403,9736"; a="222197537" X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="222197537" 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:33 -0700 IronPort-SDR: y8DQewE3y043/mLbhowCC31WXj4hrksyqFm1vSjbRA7NvLeOYCbktQnZ0rI+T50l6aNlboYyTZ I3eet7K+neqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,401,1592895600"; d="scan'208";a="316841886" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2020 04:11:31 -0700 From: "Jiang, YuX" To: dts@dpdk.org Cc: "Jiang,yu" , Jiang@dpdk.org Date: Mon, 7 Sep 2020 19:10:35 +0800 Message-Id: <20200907111035.7697-10-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 9/9] tests/compress_common: 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/compress_common.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/compress_common.py b/tests/compress_common.py index 6bde1ce..4afdcde 100644 --- a/tests/compress_common.py +++ b/tests/compress_common.py @@ -127,8 +127,7 @@ def run_unit(test_case, eal={}): default['n'] = mem_channels eal_str = get_opt_str(test_case, default, eal) - cmdline = "./{target}/app/test {eal}".format(target = test_case.dut.target, - eal = eal_str) + cmdline = "./{app_path} {eal}".format(app_path = test_case.dut.apps_name['test'], eal= eal_str) test_case.dut.send_expect(cmdline, ">", 30) out = test_case.dut.send_expect("compressdev_autotest", ">", 30) test_case.dut.send_expect("quit", "# ", 30) @@ -144,10 +143,10 @@ def run_compress_func(test_case, eal={}, opt={}): for each_file in input_file: test_case.logger.info("Testing file: {}".format(each_file)) - cmdline = "./{target}/app/dpdk-test-compress-perf {eal}\ + cmdline = "./{app_path} {eal}\ -- --input-file {file} {opt}" - cmdline = cmdline.format(target = test_case.dut.target, + cmdline = cmdline.format(app_path = test_case.dut.apps_name['test-compress-perf'], eal = eal_str, file = each_file, opt = opt_str) @@ -177,10 +176,10 @@ def run_compress_perf(test_case, eal={}, opt={}): for each_seg in [1, 2, 4, 8, 16, 32]: test_case.logger.info("Testing file: {}, seg-sz: {}".format(perf_file, each_seg * 1024)) - cmdline = "./{target}/app/dpdk-test-compress-perf {eal}\ + cmdline = "./{app_path} {eal}\ -- --input-file {file} --seg-sz {seg} {opt}" - cmdline = cmdline.format(target = test_case.dut.target, + cmdline = cmdline.format(app_path = test_case.dut.apps_name['test-compress-perf'], eal = eal_str, file = perf_file, seg = each_seg * 1024,