From patchwork Tue Aug 11 16:46:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 75411 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 74EEDA04D9; Tue, 11 Aug 2020 11:00:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6DB3A4C9D; Tue, 11 Aug 2020 11:00:15 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 6C2222AB for ; Tue, 11 Aug 2020 11:00:14 +0200 (CEST) IronPort-SDR: f0PrIlK8izlrT7sckeW8c1MVF3AbNB4yTP5iF9J1x5NOaryaJVLdEgFnkfkQHug/UjjCrSKL7/ oyToZrASsdpw== X-IronPort-AV: E=McAfee;i="6000,8403,9709"; a="133747855" X-IronPort-AV: E=Sophos;i="5.75,460,1589266800"; d="scan'208";a="133747855" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2020 02:00:13 -0700 IronPort-SDR: 6fyEgDEIyxYR44r+hXwmmoDRON8/8GMV0m7cffX/ISrv0wGncExu27cdizpQ2FWo47abFkRdpH QCYPrlNsmdHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,460,1589266800"; d="scan'208";a="398470300" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by fmsmga001.fm.intel.com with ESMTP; 11 Aug 2020 02:00:12 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Tue, 11 Aug 2020 16:46:41 +0000 Message-Id: <20200811164641.58431-1-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/l3fwd_base: update to support meson 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" update dts to support meson build type Signed-off-by: lingwei --- tests/l3fwd_base.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/l3fwd_base.py b/tests/l3fwd_base.py index a6e26b0..2cac378 100644 --- a/tests/l3fwd_base.py +++ b/tests/l3fwd_base.py @@ -640,8 +640,8 @@ class L3fwdBase(object): """ Prepare long prefix match table, __replace P(x) port pattern """ - l3fwd_method = '_'.join(['l3fwd', mode.value]) - self.d_con("make clean -C examples/l3fwd") + self.app_name = self.dut.apps_name['l3fwd'].replace(' ', '') + l3fwd_method = ''.join(['_', mode.value]) flg = 1 if mode is MATCH_MODE.LPM else 0 _opt = "USER_FLAGS=-DAPP_LOOKUP_METHOD={}".format(flg) \ if self.__mode is SUITE_TYPE.PF else '' @@ -649,12 +649,11 @@ class L3fwdBase(object): self.verify("Error" not in out, "compilation error 1") self.verify("No such file" not in out, "compilation error 2") if not rename: - return "./examples/l3fwd/build/l3fwd" + return "./" + self.app_name # rename binary file self.d_con( - ("mv -f examples/l3fwd/build/l3fwd " - "examples/l3fwd/build/{}").format(l3fwd_method)) - l3fwd_bin = os.path.join("./examples/l3fwd/build/", l3fwd_method) + ("mv -f " + self.app_name + " " + self.app_name + "{}").format(l3fwd_method)) + l3fwd_bin = os.path.join("./" + self.app_name + l3fwd_method) return l3fwd_bin def __start_l3fwd(self, mode, core_mask, config, frame_size):