From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3968BA04C9; Wed, 16 Sep 2020 14:45:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32A301C2A9; Wed, 16 Sep 2020 14:45:09 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id A5C831C299 for ; Wed, 16 Sep 2020 14:45:07 +0200 (CEST) IronPort-SDR: u1K9UUJzcwa0lJ8O0cN+wtxafhMosdutkBpfnVy9YRb2ViM2hXs+7VyQY0fBzsfTiV4UcpByeJ Zecc9YErOynw== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="160383173" X-IronPort-AV: E=Sophos;i="5.76,432,1592895600"; d="scan'208";a="160383173" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 05:45:07 -0700 IronPort-SDR: kgVVmOs5rbP2u9LQotpdKwNEu3MqPOtYn05Raby4kGi1hsBFm9ksob0LL4ZrzyRcZ22S9DJYaS TKF4NtjQT+6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,432,1592895600"; d="scan'208";a="409542393" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by fmsmga001.fm.intel.com with ESMTP; 16 Sep 2020 05:45:06 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: "Zhou, Jun" , Zhou@dpdk.org Date: Wed, 16 Sep 2020 12:29:51 +0000 Message-Id: <20200916122951.17646-11-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200916122951.17646-1-junx.w.zhou@intel.com> References: <20200916122951.17646-1-junx.w.zhou@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH 10/10] tests/TestSuite_ddp_gtp.py: adapt to support both meson and makefile 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" adapt to support both meson and makefile build Signed-off-by: Zhou, Jun --- tests/TestSuite_ddp_gtp.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py index 972c4016..11fe7cb8 100644 --- a/tests/TestSuite_ddp_gtp.py +++ b/tests/TestSuite_ddp_gtp.py @@ -27,7 +27,7 @@ class TestDdpGtp(TestCase): profile_file = 'dep/gtp.pkgo' profile_dst = "/tmp/" self.dut.session.copy_file_to(profile_file, profile_dst) - self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' + self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' # commit ee653bd8, queue number of per vf default value is defined # in drivers/net/i40e/i40e_ethdev.c, named as RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF self.VF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF' @@ -43,6 +43,7 @@ class TestDdpGtp(TestCase): else: self.vf_assign_method = 'vfio-pci' self.dut.send_expect('modprobe vfio-pci', '#') + def insmod_modprobe(self,modename=''): """ Insmod modProbe before run test case @@ -76,15 +77,14 @@ class TestDdpGtp(TestCase): else: self.load_profile() - def search_queue_number(self, Q_strip): """ Search max queue number from configuration. """ if Q_strip is self.PF_Q_strip: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - pattern = "(%s=)(\d*)" % Q_strip - else : + out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10) + pattern = "define (%s) (\d*)" % Q_strip + else: out = self.dut.send_expect("cat drivers/net/i40e/i40e_ethdev.c", "]# ", 10) pattern = "#define %s\s*(\d*)" % Q_strip s = re.compile(pattern) @@ -142,7 +142,6 @@ class TestDdpGtp(TestCase): self.vm0_testpmd = PmdOutput(self.vm0_dut) self.env_done = True - def destroy_vm_env(self): if getattr(self, 'vm0', None): @@ -185,8 +184,6 @@ class TestDdpGtp(TestCase): self.dut_testpmd.execute_cmd('start') time.sleep(2) - - def gtp_packets( self, type='fdir', tunnel_pkt='gtpu', inner_L3='ipv4', match_opt='matched', chk='', teid=0xF): -- 2.25.1