From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D161A04FD; Thu, 10 Nov 2022 08:32:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 162B240143; Thu, 10 Nov 2022 08:32:55 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 21C7F400EF for ; Thu, 10 Nov 2022 08:32:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668065573; x=1699601573; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=majTMldF6l38MNWoGySmq1eJf3vGCMibKNc1jKfkrOI=; b=S5swI6K18ADpWRWUkzjcrs+ncOH6Ltnj/hF2sjIBv+geQN7fyadI4ZH7 vTL8lPl5GnBm9EsqAkaBUI4ESD9q4NkVJ4QyBxTZ0/yisBDkK7oDRKyMO dQPXcfbCT6uqIJV1dgWLAOyeenScLbfCPBXXgVlurVWk8MwPw+KTuygcn syzMU4EQVVCex4h6lM0gfFVce0VzAmCEZoHR8FcictzDMrrudE9OUvx7u SupYlo8EIYXVKXAW1pG16nR1IabYnLVOlHUJRGZbTVig74WxsRBrge677 bHpSarxRzKEWWsbqjLEC7dVJeG9PYIAj72S8+/f4M53+EynfwZuJXim05 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10526"; a="291634315" X-IronPort-AV: E=Sophos;i="5.96,153,1665471600"; d="scan'208";a="291634315" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2022 23:32:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10526"; a="588072146" X-IronPort-AV: E=Sophos;i="5.96,153,1665471600"; d="scan'208";a="588072146" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2022 23:32:50 -0800 From: Weiyuan Li To: dts@dpdk.org Cc: Weiyuan Li Subject: [dts][PATCH V1 1/2] tests/meson_tests: modify meson_tests suite to support test config in conf Date: Thu, 10 Nov 2022 15:32:37 +0800 Message-Id: <20221110073238.7295-1-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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 Modify meson_tests suite to support test config (TIMEOUT_MULTIPLIER, TEST_ARGS etc.) in conf/meson_tests.cfg. Signed-off-by: Weiyuan Li --- tests/TestSuite_meson_tests.py | 61 ++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/tests/TestSuite_meson_tests.py b/tests/TestSuite_meson_tests.py index ee95fffa..2b9f0c6a 100644 --- a/tests/TestSuite_meson_tests.py +++ b/tests/TestSuite_meson_tests.py @@ -13,8 +13,31 @@ 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 +meson_args = { + "time_out": "-t", + "test_args": "--test-args", + "verbose": "-v", + "num_processes": "--num-processes", + "repeat": "--repeat", + "no-rebuild": "--no-rebuild", + "gdb": "--gdb", + "gdb-path": "--gdb-path", + "list": "--list", + "wrapper": "--wrapper", + "WD": "-C", + "no-suite": "--no-suite", + "no-stdsplit": "--no-stdsplit", + "print-errorlogs": "--print-errorlogs", + "benchmark": "--benchmark", + "logbase": "--logbase", + "quiet": "--quiet", + "setup": "--setup", +} + class TestMesonTests(TestCase): def set_up_all(self): @@ -36,6 +59,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 +125,21 @@ 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"] + if suite != "-1": + param += suite + for item in params_list: + param_vlaue = params_list[item] + if item in meson_args.keys(): + key = meson_args[item] + if param_vlaue != "-1": + param += " " + key + " " + params_list[item] + 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 +182,49 @@ 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 +234,13 @@ 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