From: "Jiang, YuX" <yux.jiang@intel.com>
To: dts@dpdk.org
Cc: "Jiang,yu" <yux.jiang@intel.com>, Jiang@dpdk.org
Subject: [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build
Date: Mon, 7 Sep 2020 19:10:32 +0800 [thread overview]
Message-ID: <20200907111035.7697-7-yux.jiang@intel.com> (raw)
In-Reply-To: <20200907111035.7697-1-yux.jiang@intel.com>
From: "Jiang,yu" <yux.jiang@intel.com>
adapt to support both meson and makefile build
Signed-off-by: Jiang,yu <yux.jiang@intel.com>
---
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
next prev parent reply other threads:[~2020-09-07 11:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 1/9] tests/TestSuite_crypto_perf_cryptodev_perf: support meson build Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 2/9] tests/TestSuite_fips_cryptodev: " Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 3/9] tests/TestSuite_ipsec_gw_cryptodev_func: " Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 4/9] tests/TestSuite_l2fwd_cryptodev_func: " Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 5/9] tests/TestSuite_unit_tests_cryptodev_func: " Jiang, YuX
2020-09-07 11:10 ` Jiang, YuX [this message]
2020-09-07 11:10 ` [dts] [PATCH V1 7/9] tests/TestSuite_virtio_perf_cryptodev_func: " Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 8/9] tests/TestSuite_virtio_unit_cryptodev_func: " Jiang, YuX
2020-09-07 11:10 ` [dts] [PATCH V1 9/9] tests/compress_common: " Jiang, YuX
2020-09-08 5:04 ` [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Ma, LihongX
2020-09-10 1:14 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200907111035.7697-7-yux.jiang@intel.com \
--to=yux.jiang@intel.com \
--cc=Jiang@dpdk.org \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).