* [dts][PATCH V2 1/2] tests/meson_tests: modify meson_tests suite to support test config parameter
@ 2022-11-21 6:38 Weiyuan Li
2022-11-21 6:38 ` [dts][PATCH V2 2/2] conf/meson_tests: " Weiyuan Li
0 siblings, 1 reply; 2+ messages in thread
From: Weiyuan Li @ 2022-11-21 6:38 UTC (permalink / raw)
To: dts; +Cc: Weiyuan Li, Yu Jiang
Modify meson_tests suite to support test config (TIMEOUT_MULTIPLIER, TEST_ARGS etc.) in conf/meson_tests.cfg.
Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
Tested-by: Yu Jiang <yux.jiang@intel.com>
v2:
-modify profile parameter descriptions and configuration items.
tests/TestSuite_meson_tests.py | 39 ++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/tests/TestSuite_meson_tests.py b/tests/TestSuite_meson_tests.py
index ee95fffa..5600ea87 100644
--- a/tests/TestSuite_meson_tests.py
+++ b/tests/TestSuite_meson_tests.py
@@ -13,6 +13,8 @@ from mimetypes import init
from sre_constants import SUCCESS
import framework.utils as utils
+from framework.config import UserConf
+from framework.settings import CONFIG_ROOT_PATH
from framework.test_case import TestCase
@@ -36,6 +38,9 @@ class TestMesonTests(TestCase):
os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "output"
)
+ config_file = os.path.join(CONFIG_ROOT_PATH, "meson_tests.cfg")
+ self.config_peer = UserConf(config_file)
+
def set_up(self):
"""
Run before each test case.
@@ -99,6 +104,16 @@ class TestMesonTests(TestCase):
sub_timeout = "[" + ",".join(timeout) + "] sub case time out. "
self.verify(False, f"Test failed. {sub_fail}{sub_timeout}")
+ def meson_param(self, caselist):
+ param = ""
+ conf_session = self.config_peer.conf._sections
+ suite = conf_session["suite"][caselist]
+ params_list = conf_session["options"]["param"]
+ if suite != "-1":
+ param += suite
+ param += " " + params_list
+ return param
+
def check_scp_file_valid_between_dut(self):
out = self.tester.send_command(
f"scp root@{self.dut_ip}:/root/{self.dut_pathlog} {self.base_output}",
@@ -141,49 +156,46 @@ class TestMesonTests(TestCase):
self.check_sub_case()
def test_fasts(self):
+ param = self.meson_param("fast-tests")
# init file name
self.dut_pathlog = "fast-test.log"
self.delete_exists_files()
self.insmod_kni()
# config test case list in conf/meson_tests.cfg
- caselist = self.get_suite_cfg()["fast-tests"]
- cmds = f'meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:fast-tests {caselist} -t {self.ratio} --test-args="-c 0xff" |tee /root/{self.dut_pathlog}'
+ cmds = f"meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:fast-tests {param} |tee /root/{self.dut_pathlog}"
out = self.dut.send_expect(cmds, "# ", self.execute_wait_time)
self.logger.info(out)
self.check_scp_file_valid_between_dut()
self.check_meson_test_result()
def test_driver(self):
+ param = self.meson_param("driver-tests")
# init file name
self.dut_pathlog = "driver-test.log"
self.delete_exists_files()
- # config test case list in conf/meson_tests.cfg
- caselist = self.get_suite_cfg()["driver-tests"]
- cmds = f'meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:driver-tests {caselist} -t {self.ratio} --test-args="-c 0xff" |tee /root/{self.dut_pathlog}'
+ cmds = f"meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:driver-tests {param} |tee /root/{self.dut_pathlog}"
out = self.dut.send_expect(cmds, "# ", self.execute_wait_time)
self.logger.info(out)
self.check_scp_file_valid_between_dut()
self.check_meson_test_result()
def test_debug(self):
+ param = self.meson_param("debug-tests")
self.dut_pathlog = "test-debug.log"
# delete exists files
self.delete_exists_files()
- # config test case list in conf/meson_tests.cfg
- caselist = self.get_suite_cfg()["debug-tests"]
- cmds = f'meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:debug-tests {caselist} -t {self.ratio} --test-args="-c 0xff" |tee /root/{self.dut_pathlog}'
+ cmds = f"meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:debug-tests {param} |tee /root/{self.dut_pathlog}"
out = self.dut.send_expect(cmds, "# ", self.execute_wait_time)
self.logger.info(out)
self.check_scp_file_valid_between_dut()
self.check_meson_test_result()
def test_extra(self):
+ param = self.meson_param("extra-tests")
self.dut_pathlog = "extra-test.log"
# delete exists files
self.delete_exists_files()
- # config test case list in conf/meson_tests.cfg
- caselist = self.get_suite_cfg()["extra-tests"]
- cmds = f'meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:extra-tests {caselist} -t {self.ratio} --test-args="-c 0xff" |tee /root/{self.dut_pathlog}'
+ cmds = f"meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:extra-tests {param} |tee /root/{self.dut_pathlog}"
out = self.dut.send_expect(cmds, "# ", self.execute_wait_time)
self.logger.info(out)
self.check_scp_file_valid_between_dut()
@@ -193,13 +205,12 @@ class TestMesonTests(TestCase):
)
def test_perf(self):
+ param = self.meson_param("perf-tests")
# init file name
self.dut_pathlog = "perf-test.log"
# delete exists files
self.delete_exists_files()
- # config test case list in conf/meson_tests.cfg
- caselist = self.get_suite_cfg()["perf-tests"]
- cmds = f'meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:perf-tests {caselist} -t {self.ratio} --test-args="-c 0xff" |tee /root/{self.dut_pathlog}'
+ cmds = f"meson test -C x86_64-native-linuxapp-gcc/ --suite DPDK:perf-tests {param} |tee /root/{self.dut_pathlog}"
out = self.dut.send_expect(cmds, "# ", self.execute_wait_time)
self.logger.info(out)
self.check_scp_file_valid_between_dut()
--
2.27.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [dts][PATCH V2 2/2] conf/meson_tests: modify meson_tests suite to support test config parameter
2022-11-21 6:38 [dts][PATCH V2 1/2] tests/meson_tests: modify meson_tests suite to support test config parameter Weiyuan Li
@ 2022-11-21 6:38 ` Weiyuan Li
0 siblings, 0 replies; 2+ messages in thread
From: Weiyuan Li @ 2022-11-21 6:38 UTC (permalink / raw)
To: dts; +Cc: Weiyuan Li, Yu Jiang
Modify meson_tests suite to support test config (TIMEOUT_MULTIPLIER, TEST_ARGS etc.) in conf/meson_tests.cfg.
Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
Tested-by: Yu Jiang <yux.jiang@intel.com>
v2:
-Modify profile parameter descriptions and configuration items
conf/meson_tests.cfg | 39 ++++++++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 5 deletions(-)
diff --git a/conf/meson_tests.cfg b/conf/meson_tests.cfg
index 8dcb3d2e..250597fd 100644
--- a/conf/meson_tests.cfg
+++ b/conf/meson_tests.cfg
@@ -1,8 +1,37 @@
# config unit test case for meson test
# caselist = thash_autotest trace_autotest
+# not enabled if option value is set to - 1
+# meson parameter usage: meson test [-h] [--repeat REPEAT] [--no-rebuild] [--gdb] [--gdb-path GDB_PATH] [--list] [--wrapper WRAPPER] [-C WD] [--suite SUITE] [--no-suite SUITE] [--no-stdsplit]
+# [--print-errorlogs] [--benchmark] [--logbase LOGBASE] [--num-processes NUM_PROCESSES] [-v] [-q] [-t TIMEOUT_MULTIPLIER] [--setup SETUP] [--test-args TEST_ARGS]
+# [args ...]
+# options:
+# -h, --help show this help message and exit
+# --repeat REPEAT Number of times to run the tests.
+# --no-rebuild Do not rebuild before running tests.
+# --gdb Run test under gdb.
+# --gdb-path GDB_PATH Path to the gdb binary (default: gdb).
+# --list List available tests.
+# --wrapper WRAPPER wrapper to run tests with (e.g. Valgrind)
+# -C WD directory to cd into before running
+# --suite SUITE Only run tests belonging to the given suite.
+# --no-suite SUITE Do not run tests belonging to the given suite.
+# --no-stdsplit Do not split stderr and stdout in test logs.
+# --print-errorlogs Whether to print failing tests' logs.
+# --benchmark Run benchmarks instead of tests.
+# --logbase LOGBASE Base name for log file.
+# --num-processes NUM_PROCESSES How many parallel processes to use.
+# -v, --verbose Do not redirect stdout and stderr
+# -q, --quiet Produce less output to the terminal.
+# -t TIMEOUT_MULTIPLIER, --timeout-multiplier TIMEOUT_MULTIPLIER Define a multiplier for test timeout, for example when running tests in particular conditions they might take more
+# time to execute. (<= 0 to disable timeout)
+# --setup SETUP Which test setup to use.
+# --test-args TEST_ARGS Arguments to pass to the specified test(s) or all tests
+
[suite]
-fast-tests = " "
-driver-tests = " "
-debug-tests = " "
-extra-tests = " "
-perf-tests = " "
+fast-tests = -1
+driver-tests = -1
+debug-tests = -1
+extra-tests = -1
+perf-tests = -1
+[options]
+param = -t 14 --test-args '-c 0xff' --num-processes 20
--
2.27.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-21 6:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-21 6:38 [dts][PATCH V2 1/2] tests/meson_tests: modify meson_tests suite to support test config parameter Weiyuan Li
2022-11-21 6:38 ` [dts][PATCH V2 2/2] conf/meson_tests: " Weiyuan Li
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).