test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1 0/9] Modify suites to support meson & makefile
@ 2020-09-07 11:10 Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 1/9] tests/TestSuite_crypto_perf_cryptodev_perf: support meson build Jiang, YuX
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu

From: "Jiang,yu" <yux.jiang@intel.com>

Modify suite to support meson & makefile

Jiang,yu (9):
  tests/TestSuite_crypto_perf_cryptodev_perf: support meson build
  tests/TestSuite_fips_cryptodev: support meson build
  tests/TestSuite_ipsec_gw_cryptodev_func: support meson build
  tests/TestSuite_l2fwd_cryptodev_func: support meson build
  tests/TestSuite_unit_tests_cryptodev_func: support meson build
  tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build
  tests/TestSuite_virtio_perf_cryptodev_func: support meson build
  tests/TestSuite_virtio_unit_cryptodev_func: support meson build
  tests/compress_common: support meson build

 tests/TestSuite_crypto_perf_cryptodev_perf.py  |  3 +--
 tests/TestSuite_fips_cryptodev.py              |  2 +-
 tests/TestSuite_ipsec_gw_cryptodev_func.py     |  2 +-
 tests/TestSuite_l2fwd_cryptodev_func.py        |  2 +-
 tests/TestSuite_unit_tests_cryptodev_func.py   |  2 +-
 tests/TestSuite_virtio_ipsec_cryptodev_func.py | 22 +++++++---------------
 tests/TestSuite_virtio_perf_cryptodev_func.py  | 20 ++++++--------------
 tests/TestSuite_virtio_unit_cryptodev_func.py  | 15 +++++----------
 tests/compress_common.py                       | 11 +++++------
 9 files changed, 28 insertions(+), 51 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 1/9] tests/TestSuite_crypto_perf_cryptodev_perf: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
@ 2020-09-07 11:10 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 2/9] tests/TestSuite_fips_cryptodev: " Jiang, YuX
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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)
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 2/9] tests/TestSuite_fips_cryptodev: support meson build
  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 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 3/9] tests/TestSuite_ipsec_gw_cryptodev_func: " Jiang, YuX
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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,
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 3/9] tests/TestSuite_ipsec_gw_cryptodev_func: support meson build
  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 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 4/9] tests/TestSuite_l2fwd_cryptodev_func: " Jiang, YuX
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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")
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 4/9] tests/TestSuite_l2fwd_cryptodev_func: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (2 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 3/9] tests/TestSuite_ipsec_gw_cryptodev_func: " Jiang, YuX
@ 2020-09-07 11:10 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 5/9] tests/TestSuite_unit_tests_cryptodev_func: " Jiang, YuX
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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)
 
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 5/9] tests/TestSuite_unit_tests_cryptodev_func: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (3 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 4/9] tests/TestSuite_l2fwd_cryptodev_func: " Jiang, YuX
@ 2020-09-07 11:10 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: " Jiang, YuX
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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")
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (4 preceding siblings ...)
  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
  2020-09-07 11:10 ` [dts] [PATCH V1 7/9] tests/TestSuite_virtio_perf_cryptodev_func: " Jiang, YuX
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 7/9] tests/TestSuite_virtio_perf_cryptodev_func: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (5 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: " Jiang, YuX
@ 2020-09-07 11:10 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 8/9] tests/TestSuite_virtio_unit_cryptodev_func: " Jiang, YuX
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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)
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 8/9] tests/TestSuite_virtio_unit_cryptodev_func: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (6 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 7/9] tests/TestSuite_virtio_perf_cryptodev_func: " Jiang, YuX
@ 2020-09-07 11:10 ` Jiang, YuX
  2020-09-07 11:10 ` [dts] [PATCH V1 9/9] tests/compress_common: " Jiang, YuX
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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_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/*")
 
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [dts] [PATCH V1 9/9] tests/compress_common: support meson build
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (7 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 8/9] tests/TestSuite_virtio_unit_cryptodev_func: " Jiang, YuX
@ 2020-09-07 11:10 ` 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
  10 siblings, 0 replies; 12+ messages in thread
From: Jiang, YuX @ 2020-09-07 11:10 UTC (permalink / raw)
  To: dts; +Cc: Jiang,yu, Jiang

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/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,
-- 
2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dts] [PATCH V1 0/9] Modify suites to support meson & makefile
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (8 preceding siblings ...)
  2020-09-07 11:10 ` [dts] [PATCH V1 9/9] tests/compress_common: " Jiang, YuX
@ 2020-09-08  5:04 ` Ma, LihongX
  2020-09-10  1:14 ` Tu, Lijuan
  10 siblings, 0 replies; 12+ messages in thread
From: Ma, LihongX @ 2020-09-08  5:04 UTC (permalink / raw)
  To: Jiang, YuX, dts; +Cc: Jiang, YuX

Acked-by: LihongX Ma<lihongx.ma@intel.com>

Regards,
Ma,lihong

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiang, YuX
> Sent: Monday, September 7, 2020 7:10 PM
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1 0/9] Modify suites to support meson & makefile
> 
> From: "Jiang,yu" <yux.jiang@intel.com>
> 
> Modify suite to support meson & makefile
> 
> Jiang,yu (9):
>   tests/TestSuite_crypto_perf_cryptodev_perf: support meson build
>   tests/TestSuite_fips_cryptodev: support meson build
>   tests/TestSuite_ipsec_gw_cryptodev_func: support meson build
>   tests/TestSuite_l2fwd_cryptodev_func: support meson build
>   tests/TestSuite_unit_tests_cryptodev_func: support meson build
>   tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build
>   tests/TestSuite_virtio_perf_cryptodev_func: support meson build
>   tests/TestSuite_virtio_unit_cryptodev_func: support meson build
>   tests/compress_common: support meson build
> 
>  tests/TestSuite_crypto_perf_cryptodev_perf.py  |  3 +--
>  tests/TestSuite_fips_cryptodev.py              |  2 +-
>  tests/TestSuite_ipsec_gw_cryptodev_func.py     |  2 +-
>  tests/TestSuite_l2fwd_cryptodev_func.py        |  2 +-
>  tests/TestSuite_unit_tests_cryptodev_func.py   |  2 +-
>  tests/TestSuite_virtio_ipsec_cryptodev_func.py | 22 +++++++---------------
> tests/TestSuite_virtio_perf_cryptodev_func.py  | 20 ++++++--------------
> tests/TestSuite_virtio_unit_cryptodev_func.py  | 15 +++++----------
>  tests/compress_common.py                       | 11 +++++------
>  9 files changed, 28 insertions(+), 51 deletions(-)
> 
> --
> 2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [dts] [PATCH V1 0/9] Modify suites to support meson & makefile
  2020-09-07 11:10 [dts] [PATCH V1 0/9] Modify suites to support meson & makefile Jiang, YuX
                   ` (9 preceding siblings ...)
  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
  10 siblings, 0 replies; 12+ messages in thread
From: Tu, Lijuan @ 2020-09-10  1:14 UTC (permalink / raw)
  To: Jiang, YuX, dts; +Cc: Jiang, YuX

Applied, thanks

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiang, YuX
> Sent: 2020年9月7日 19:10
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1 0/9] Modify suites to support meson & makefile
> 
> From: "Jiang,yu" <yux.jiang@intel.com>
> 
> Modify suite to support meson & makefile
> 
> Jiang,yu (9):
>   tests/TestSuite_crypto_perf_cryptodev_perf: support meson build
>   tests/TestSuite_fips_cryptodev: support meson build
>   tests/TestSuite_ipsec_gw_cryptodev_func: support meson build
>   tests/TestSuite_l2fwd_cryptodev_func: support meson build
>   tests/TestSuite_unit_tests_cryptodev_func: support meson build
>   tests/TestSuite_virtio_ipsec_cryptodev_func: support meson build
>   tests/TestSuite_virtio_perf_cryptodev_func: support meson build
>   tests/TestSuite_virtio_unit_cryptodev_func: support meson build
>   tests/compress_common: support meson build
> 
>  tests/TestSuite_crypto_perf_cryptodev_perf.py  |  3 +--
>  tests/TestSuite_fips_cryptodev.py              |  2 +-
>  tests/TestSuite_ipsec_gw_cryptodev_func.py     |  2 +-
>  tests/TestSuite_l2fwd_cryptodev_func.py        |  2 +-
>  tests/TestSuite_unit_tests_cryptodev_func.py   |  2 +-
>  tests/TestSuite_virtio_ipsec_cryptodev_func.py | 22 +++++++---------------
> tests/TestSuite_virtio_perf_cryptodev_func.py  | 20 ++++++--------------
> tests/TestSuite_virtio_unit_cryptodev_func.py  | 15 +++++----------
>  tests/compress_common.py                       | 11 +++++------
>  9 files changed, 28 insertions(+), 51 deletions(-)
> 
> --
> 2.7.4


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2020-09-10  1:14 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [dts] [PATCH V1 6/9] tests/TestSuite_virtio_ipsec_cryptodev_func: " Jiang, YuX
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

test suite reviews and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git