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 4408FA0093 for ; Thu, 28 May 2020 18:26:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 37CAD1DC13; Thu, 28 May 2020 18:26:29 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 565271DC2A for ; Thu, 28 May 2020 18:26:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XQG5KLvJ70gKmag1Xf3obkspGF97JdZOi0GVEUgoUS0=; b=fsc2MXbRZOJwIk+yxU/mTvdbpwSYqzSnFWCjQp98BhEEPxN4terSmLfYRrzh/IZRs0hZVU NXA3Z6YI6JRgCavHIzqnHFN5aDJUeOEyBKjl2p51/5ZaCrxiDyQ47x0Z0F4lMi/LRg+97D 30yFvJWa+pVsOuhFyvwzIbsV4ecrofg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-erW_WKrjPcSGCWMsUmXwgQ-1; Thu, 28 May 2020 12:26:23 -0400 X-MC-Unique: erW_WKrjPcSGCWMsUmXwgQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08EA3802EB0; Thu, 28 May 2020 16:26:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 249E160C05; Thu, 28 May 2020 16:26:20 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Bruce Richardson , dpdk stable Date: Thu, 28 May 2020 17:23:20 +0100 Message-Id: <20200528162322.7863-93-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app: fix usage help of options separated by dashes' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb Thanks. Kevin. --- >From eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 21 Apr 2020 01:25:31 +0200 Subject: [PATCH] app: fix usage help of options separated by dashes [ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ] The EAL options and app-specific options are separated with double dashes. The help of testpmd, test-acl and pdump were missing the dashes after EAL options. Note: testpmd was completely missing the EAL options. Fixes: af75078fece3 ("first public release") Fixes: 26c057ab6c45 ("acl: new test-acl application") Fixes: b2854d5317e8 ("app/pdump: support multi-core capture") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- app/test-pmd/parameters.c | 2 +- test/test-acl/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 4d5e28970c..57028c313f 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -53,5 +53,5 @@ static void usage(char* progname) { - printf("usage: %s " + printf("usage: %s [EAL options] -- " #ifdef RTE_LIBRTE_CMDLINE "[--interactive|-i] " diff --git a/test/test-acl/main.c b/test/test-acl/main.c index 648525af56..420a2c9b99 100644 --- a/test/test-acl/main.c +++ b/test/test-acl/main.c @@ -12,5 +12,5 @@ #include -#define PRINT_USAGE_START "%s [EAL options]\n" +#define PRINT_USAGE_START "%s [EAL options] --\n" #define RTE_LOGTYPE_TESTACL RTE_LOGTYPE_USER1 -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.957434436 +0100 +++ 0093-app-fix-usage-help-of-options-separated-by-dashes.patch 2020-05-28 17:12:59.215553821 +0100 @@ -1 +1 @@ -From a658775c57947a50847c1ca01d39de0b81400678 Mon Sep 17 00:00:00 2001 +From eb70a612f4fc54e7e3e85fc4d1e64d6e042176eb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -21,2 +21,0 @@ - app/pdump/main.c | 2 +- - app/test-acl/main.c | 2 +- @@ -24 +23,2 @@ - 3 files changed, 3 insertions(+), 3 deletions(-) + test/test-acl/main.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) @@ -26,22 +25,0 @@ -diff --git a/app/pdump/main.c b/app/pdump/main.c -index d05a023667..c38c53719e 100644 ---- a/app/pdump/main.c -+++ b/app/pdump/main.c -@@ -152,5 +152,5 @@ static void - pdump_usage(const char *prgname) - { -- printf("usage: %s [EAL options]" -+ printf("usage: %s [EAL options] --" - " --["CMD_LINE_OPT_MULTI"]\n" - " --"CMD_LINE_OPT_PDUMP" " -diff --git a/app/test-acl/main.c b/app/test-acl/main.c -index 4bc00272f4..0a5dfb621d 100644 ---- a/app/test-acl/main.c -+++ b/app/test-acl/main.c -@@ -13,5 +13,5 @@ - #include - --#define PRINT_USAGE_START "%s [EAL options]\n" -+#define PRINT_USAGE_START "%s [EAL options] --\n" - - #define RTE_LOGTYPE_TESTACL RTE_LOGTYPE_USER1 @@ -49 +27 @@ -index 404dba2b20..30c1753c32 100644 +index 4d5e28970c..57028c313f 100644 @@ -52 +30 @@ -@@ -50,5 +50,5 @@ static void +@@ -53,5 +53,5 @@ static void @@ -58,0 +37,11 @@ +diff --git a/test/test-acl/main.c b/test/test-acl/main.c +index 648525af56..420a2c9b99 100644 +--- a/test/test-acl/main.c ++++ b/test/test-acl/main.c +@@ -12,5 +12,5 @@ + #include + +-#define PRINT_USAGE_START "%s [EAL options]\n" ++#define PRINT_USAGE_START "%s [EAL options] --\n" + + #define RTE_LOGTYPE_TESTACL RTE_LOGTYPE_USER1