From patchwork Tue Sep 8 07:18:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhou, JunX W" X-Patchwork-Id: 76873 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0DA76A04AA; Tue, 8 Sep 2020 09:30:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F29D11C134; Tue, 8 Sep 2020 09:30:16 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 008851C134 for ; Tue, 8 Sep 2020 09:30:14 +0200 (CEST) IronPort-SDR: cltsNUf6XoLBexWQ0TFBvyvHVl6M5QG50HCgToYg2ZW5q21m2XsL/tsXC9BCM4asyu+0YQRTXL dGZNADz42VYg== X-IronPort-AV: E=McAfee;i="6000,8403,9737"; a="219646678" X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="219646678" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 00:30:14 -0700 IronPort-SDR: jV3yVJNERe8k+2PzxrpmSmsV4NsIgpk2/f+H1JL26spajvevqpsN8ij8rp1BYNoBwrMLQk8P5V gH86DxPVGc5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,404,1592895600"; d="scan'208";a="377432944" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 08 Sep 2020 00:30:13 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Tue, 8 Sep 2020 07:18:25 +0000 Message-Id: <20200908071825.118583-39-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908071825.118583-1-junx.w.zhou@intel.com> References: <20200908071825.118583-1-junx.w.zhou@intel.com> MIME-Version: 1.0 Subject: [dts] [dts 38/38] tests/TestSuite_vxlan_sample.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" From: Zhou jun Signed-off-by: Zhou jun --- tests/TestSuite_vxlan_sample.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py index 2fa845e..feaad14 100644 --- a/tests/TestSuite_vxlan_sample.py +++ b/tests/TestSuite_vxlan_sample.py @@ -93,15 +93,18 @@ class TestVxlanSample(TestCase): self.pf_mac = self.dut.get_mac_address(self.pf) # build sample app - out = self.dut.send_expect("make -C examples/tep_termination", "# ") + out = self.dut.build_dpdk_apps('examples/tep_termination') + # out = self.dut.send_expect("make -C examples/tep_termination", "# ") self.verify("Error" not in out, "compilation error 1") self.verify("No such file" not in out, "compilation error 2") self.def_mac = "00:00:20:00:00:20" self.vm_dut = None - self.tep_app = "./examples/tep_termination/build/tep_termination" + # self.tep_app = "./examples/tep_termination/build/tep_termination" + self.app_tep_termination_path = self.dut.apps_name['tep_termination'] self.vxlan_port = 4789 - self.vm_testpmd = "./x86_64-native-linuxapp-gcc/app/testpmd -c f -n 3" \ + self.app_testpmd_path = self.dut.apps_name['test-pmd'] + self.vm_testpmd = "./%s -c f -n 3" % self.app_testpmd_path \ + " -- -i --tx-offloads=0x8000" # params for tep_termination @@ -157,7 +160,7 @@ class TestVxlanSample(TestCase): elif self.running_case == "test_vxlan_sample_tso": chksum = self.FEAT_ENABLE - tep_cmd_temp = self.tep_app + " -c %(COREMASK)s -n %(CHANNELS)d " \ + tep_cmd_temp = self.app_tep_termination_path + " -c %(COREMASK)s -n %(CHANNELS)d " \ + "--socket-mem 2048,2048 -- -p 0x1 " \ + "--udp-port %(VXLAN_PORT)d --nb-devices %(NB_DEVS)d " \ + "--filter-type %(FILTERS)d " \ @@ -521,7 +524,7 @@ class TestVxlanSample(TestCase): decap = self.FEAT_ENABLE chksum = self.FEAT_ENABLE - tep_cmd_temp = self.tep_app + " -c %(COREMASK)s -n %(CHANNELS)d " \ + tep_cmd_temp = self.app_tep_termination_path + " -c %(COREMASK)s -n %(CHANNELS)d " \ + "--socket-mem 2048,2048 -- -p 0x1 --udp-port " \ + "%(VXLAN_PORT)d --nb-devices %(NB_DEVS)d --filter-type " \ + "%(FILTERS)d --tx-checksum %(TX_CHKS)d --encap %(ENCAP)d " \