From patchwork Thu Apr 6 07:18:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingli Chen X-Patchwork-Id: 125846 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8073D428D8; Thu, 6 Apr 2023 10:28:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 075E742D17; Thu, 6 Apr 2023 10:28:08 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 29F3C40DF6 for ; Thu, 6 Apr 2023 10:28:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680769687; x=1712305687; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=gEIbi7FzDoNDRTZTQpZpnj2eitWR1T65EugSrSiR1x4=; b=eb+xdi8iwJ9aGd5rFU5TMk6lEG3KzJ78735VTjnn0vGH8NYY6KPzug0j 58eFVSSl/I44Afa5EZRnoaMlr91si0+79+503wKkXkR+NLebI6Ry/UUyk +2x9oEb77Bhsi8YhusDe0XAIKLZ0aN2u62CBpfc7X7WBybEVCplo0ftvZ yXYEuRQRl3fRB8wsISZljkrEOIBWRUCmexUsD7BEsl+HhvEltiCwMwdjr LdnsX7QRbdnmhuFQKMWIw9V54sPZ1Muee35+6wXPP6nIALFub6UD2k4Pv rndqHCgrRkODeoK5Ju787gZ91364tsnaP5XNMmptYt/U4Q1vlKxd7WYVF A==; X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="344414168" X-IronPort-AV: E=Sophos;i="5.98,323,1673942400"; d="scan'208";a="344414168" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2023 01:28:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="637187685" X-IronPort-AV: E=Sophos;i="5.98,323,1673942400"; d="scan'208";a="637187685" Received: from unknown (HELO localhost.localdomain) ([10.239.252.99]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2023 01:28:05 -0700 From: Lingli Chen To: dts@dpdk.org Cc: Lingli Chen Subject: [dts][PATCH V2 2/2] tests/queue_start_stop: optimize test script to remove re-compile dpdk test Date: Thu, 6 Apr 2023 03:18:44 -0400 Message-Id: <20230406071844.4053-2-linglix.chen@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230406071844.4053-1-linglix.chen@intel.com> References: <20230406071844.4053-1-linglix.chen@intel.com> 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 1. remove re-compile dpdk test step to sync with test_plans 2. delete macfwd_log.patch Signed-off-by: Lingli Chen Tested-by: Chenyu Huang --- V2: Add delete dep/macfwd_log.patch dep/macfwd_log.patch | 10 ------- tests/TestSuite_queue_start_stop.py | 43 +++-------------------------- 2 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 dep/macfwd_log.patch diff --git a/dep/macfwd_log.patch b/dep/macfwd_log.patch deleted file mode 100644 index 0f657f82..00000000 --- a/dep/macfwd_log.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- app/test-pmd/macfwd.c.org 2015-07-02 10:51:12.821246109 +0800 -+++ app/test-pmd/macfwd.c 2015-07-02 10:50:11.343243319 +0800 -@@ -102,6 +102,7 @@ - nb_pkt_per_burst); - if (unlikely(nb_rx == 0)) - return; -+ printf("ports %u queue %u receive %u packages\n", fs->rx_port, fs->rx_queue, nb_rx); - - #ifdef RTE_TEST_PMD_RECORD_BURST_STATS - fs->rx_burst_stats.pkt_burst_spread[nb_rx]++; diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py index 80baf8d6..cfae1ada 100644 --- a/tests/TestSuite_queue_start_stop.py +++ b/tests/TestSuite_queue_start_stop.py @@ -43,21 +43,7 @@ class TestQueueStartStop(TestCase): """ Run before each test case. """ - try: - patch_file = FOLDERS["Depends"] + r"/macfwd_log.patch" - except: - self.logger.warning(str(FOLDERS)) - patch_file = r"dep/macfwd_log.patch" - FOLDERS["Depends"] = "dep" - patch_dst = "/tmp/" - - # dpdk patch and build - try: - self.dut.session.copy_file_to(patch_file, patch_dst) - self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", True) - self.dut.build_install_dpdk(self.target) - except Exception as e: - raise IOError("dpdk setup failure: %s" % e) + pass def check_forwarding(self, ports, nic, pktSize=64, received=True): self.send_packet(ports[0], ports[1], self.nic, pktSize, received) @@ -85,20 +71,6 @@ class TestQueueStartStop(TestCase): else: self.verify(len(sniff_pkts) == 0, "stop queue not work as expected") - def patch_hotfix_dpdk(self, patch_dir, on=True): - """ - This function is to apply or remove patch for dpdk. - patch_dir: the abs path of the patch - on: True for apply, False for remove - """ - try: - if on: - self.dut.send_expect("patch -p0 < %s" % patch_dir, "[~|~\]]# ") - else: - self.dut.send_expect("patch -p0 -R < %s" % patch_dir, "[~|~\]]# ") - except Exception as e: - raise ValueError("patch_hotfix_dpdk failure: %s" % e) - def test_queue_start_stop(self): """ queue start/stop test @@ -114,6 +86,7 @@ class TestQueueStartStop(TestCase): ) time.sleep(5) self.dut.send_expect("set fwd mac", "testpmd>") + self.dut.send_expect("set verbose 1", "testpmd>") self.dut.send_expect("start", "testpmd>") self.check_forwarding([0, 0], self.nic) except Exception as e: @@ -138,7 +111,7 @@ class TestQueueStartStop(TestCase): except Exception as e: raise IOError("queue start/stop forward failure: %s" % e) self.verify( - "ports 0 queue 0 receive " not in out, + "port 0/queue 0: received 1 packets" not in out, "start queue revice package failed, out = %s" % out, ) @@ -153,7 +126,7 @@ class TestQueueStartStop(TestCase): except Exception as e: raise IOError("queue start/stop forward failure: %s" % e) self.verify( - "ports 0 queue 0 receive " in out, + "port 0/queue 0: received 1 packets" in out, "start queue revice package failed, out = %s" % out, ) @@ -161,7 +134,6 @@ class TestQueueStartStop(TestCase): """ Run after each test case. """ - patch_dst = "/tmp/" try: self.dut.send_expect("stop", "testpmd>") @@ -169,13 +141,6 @@ class TestQueueStartStop(TestCase): except: print("Failed to quit testpmd") - self.dut.kill_all() - - try: - self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", False) - except Exception as e: - print(("patch_hotfix_dpdk remove failure :%s" % e)) - def tear_down_all(self): """ Run after each test suite.