From patchwork Tue Jan 19 12:01:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emma Finn X-Patchwork-Id: 1428579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKnLx6W93z9s1l for ; Tue, 19 Jan 2021 23:01:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F07C2204DC; Tue, 19 Jan 2021 12:01:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EWQrajcmYDu0; Tue, 19 Jan 2021 12:01:39 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id CEE4020485; Tue, 19 Jan 2021 12:01:38 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B46B4C088B; Tue, 19 Jan 2021 12:01:38 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2FAB9C013A for ; Tue, 19 Jan 2021 12:01:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A2098677B for ; Tue, 19 Jan 2021 12:01:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDeZII14mTcn for ; Tue, 19 Jan 2021 12:01:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2DF3686770 for ; Tue, 19 Jan 2021 12:01:33 +0000 (UTC) IronPort-SDR: TA+ke/Q2BZ+W18yWPmA5hQcgJbwYiRvBXbxsd7pMDe3oNLvde5rpDfe6pL3djhoOepwfzlsrBI NO75yxmUMxzg== X-IronPort-AV: E=McAfee;i="6000,8403,9868"; a="178135987" X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="178135987" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2021 04:01:32 -0800 IronPort-SDR: SkcsexARR85dJJSjPba99/GstkPXRAw9QURs4jweOn+0IzqHu1qP592Q/LCtmhDxCS3xwa85Vz rkl6ig37e3SQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,358,1602572400"; d="scan'208";a="355569493" Received: from silpixa00397517.ir.intel.com (HELO silpixa00397517.ger.corp.intel.com) ([10.237.223.81]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2021 04:01:31 -0800 From: Emma Finn To: dev@openvswitch.org, ian.stokes@intel.com Date: Tue, 19 Jan 2021 12:01:22 +0000 Message-Id: <20210119120122.8492-1-emma.finn@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH] system-dpdk: Fix 4th and 5th testcases of the system-dpdk testsuite. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Testpmd has been renamed to dpdk-testpmd as of DPDK 20.11. This commit resolves this issue and fixes these tests. Signed-off-by: Emma Finn --- tests/system-dpdk.at | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index a015d52f7..802895488 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -85,7 +85,7 @@ dnl Ping vhost-user port AT_SETUP([OVS-DPDK - ping vhost-user ports]) AT_KEYWORDS([dpdk]) OVS_DPDK_PRE_CHECK() -AT_SKIP_IF([! which testpmd >/dev/null 2>/dev/null]) +AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) OVS_DPDK_START() dnl Find number of sockets @@ -115,7 +115,7 @@ ADD_VETH(tap1, ns2, br10, "172.31.110.12/24") dnl Execute testpmd in background on_exit "pkill -f -x -9 'tail -f /dev/null'" -tail -f /dev/null | testpmd --socket-mem="$(cat NUMA_NODE)" --no-pci\ +tail -f /dev/null | dpdk-testpmd --socket-mem="$(cat NUMA_NODE)" --no-pci\ --vdev="net_virtio_user,path=$OVS_RUNDIR/dpdkvhostuser0" \ --vdev="net_tap0,iface=tap0" --file-prefix page0 \ --single-file-segments -- -a >$OVS_RUNDIR/testpmd-dpdkvhostuser0.log 2>&1 & @@ -162,7 +162,7 @@ dnl Ping vhost-user-client port AT_SETUP([OVS-DPDK - ping vhost-user-client ports]) AT_KEYWORDS([dpdk]) OVS_DPDK_PRE_CHECK() -AT_SKIP_IF([! which testpmd >/dev/null 2>/dev/null]) +AT_SKIP_IF([! which dpdk-testpmd >/dev/null 2>/dev/null]) OVS_DPDK_START() dnl Find number of sockets @@ -191,7 +191,7 @@ ADD_VETH(tap1, ns2, br10, "172.31.110.12/24") dnl Execute testpmd in background on_exit "pkill -f -x -9 'tail -f /dev/null'" -tail -f /dev/null | testpmd --socket-mem="$(cat NUMA_NODE)" --no-pci\ +tail -f /dev/null | dpdk-testpmd --socket-mem="$(cat NUMA_NODE)" --no-pci\ --vdev="net_virtio_user,path=$OVS_RUNDIR/dpdkvhostclient0,server=1" \ --vdev="net_tap0,iface=tap0" --file-prefix page0 \ --single-file-segments -- -a >$OVS_RUNDIR/testpmd-dpdkvhostuserclient0.log 2>&1 &