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 2CBFDA0093 for ; Thu, 28 May 2020 18:24:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D2B961DC1E; Thu, 28 May 2020 18:24:55 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id ABD861DC10 for ; Thu, 28 May 2020 18:24:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683094; 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=nuWDHBpMROhEvnT/LFSTBb+yOJbJ4ZV8xgCZiwsWrN0=; b=J/e/zPsarvqcJhjs5eoZd4lRp3pLSzwoFx3+CCpEz+xfsxxmC9A41QxFhv+DrMwnX2GUQX 0Jkg9u2rpuReiFFLxoVg6ehwmaY4exX+83kCNpBjIncNQyM6/MF82Ig+0u1TYzDt2EnfqO 4m3tqAxuDTwmIogBX+GefvXpIy7eRaY= 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-399-JmViRLxjOfWNQmGNbKQj1Q-1; Thu, 28 May 2020 12:24:50 -0400 X-MC-Unique: JmViRLxjOfWNQmGNbKQj1Q-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 B836318FE861; Thu, 28 May 2020 16:24:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D407C60C05; Thu, 28 May 2020 16:24:48 +0000 (UTC) From: Kevin Traynor To: Olivier Matz Cc: David Marchand , dpdk stable Date: Thu, 28 May 2020 17:22:11 +0100 Message-Id: <20200528162322.7863-24-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 'test/kvargs: fix to consider empty elements as valid' 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/407553773e75f41dd89c82091e6458c98856bfaa Thanks. Kevin. --- >From 407553773e75f41dd89c82091e6458c98856bfaa Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 27 Mar 2020 09:09:53 +0100 Subject: [PATCH] test/kvargs: fix to consider empty elements as valid [ upstream commit 55fa01f7edfc9d2fa5af57ffb8991750fbdb1528 ] Empty elements passed to the kvargs parser are silently ignored. Examples of valid strings: "" "," ",,,,,,key=val,,,," Fix the unit tests to conform to this behavior. Note: the test_invalid_kvargs() function is currently broken, which explain why the tests were not failing. It is fixed in the next commit. Fixes: e495f5435524 ("kvargs: add test case in app/test") Signed-off-by: Olivier Matz Reviewed-by: David Marchand --- test/test/test_kvargs.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/test/test/test_kvargs.c b/test/test/test_kvargs.c index a42056f361..d3db88a57a 100644 --- a/test/test/test_kvargs.c +++ b/test/test/test_kvargs.c @@ -143,5 +143,5 @@ static int test_valid_kvargs(void) kvlist = rte_kvargs_parse(args, valid_keys); if (kvlist == NULL) { - printf("rte_kvargs_parse() error"); + printf("rte_kvargs_parse() error\n"); goto fail; } @@ -158,4 +158,38 @@ static int test_valid_kvargs(void) rte_kvargs_free(kvlist); + /* test using empty string (it is valid) */ + args = ""; + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error\n"); + goto fail; + } + if (rte_kvargs_count(kvlist, NULL) != 0) { + printf("invalid count value\n"); + goto fail; + } + rte_kvargs_free(kvlist); + + /* test using empty elements (it is valid) */ + args = "foo=1,,check=value2,,"; + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error\n"); + goto fail; + } + if (rte_kvargs_count(kvlist, NULL) != 2) { + printf("invalid count value\n"); + goto fail; + } + if (rte_kvargs_count(kvlist, "foo") != 1) { + printf("invalid count value for 'foo'\n"); + goto fail; + } + if (rte_kvargs_count(kvlist, "check") != 1) { + printf("invalid count value for 'check'\n"); + goto fail; + } + rte_kvargs_free(kvlist); + return 0; @@ -180,5 +214,4 @@ static int test_invalid_kvargs(void) "wrong-key=x", /* key not in valid_keys_list */ "foo=1,foo=", /* empty value */ - "foo=1,,foo=2", /* empty key/value */ "foo=1,foo", /* no value */ "foo=1,=2", /* no key */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:00.425816248 +0100 +++ 0024-test-kvargs-fix-to-consider-empty-elements-as-valid.patch 2020-05-28 17:12:59.085556762 +0100 @@ -1 +1 @@ -From 55fa01f7edfc9d2fa5af57ffb8991750fbdb1528 Mon Sep 17 00:00:00 2001 +From 407553773e75f41dd89c82091e6458c98856bfaa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 55fa01f7edfc9d2fa5af57ffb8991750fbdb1528 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ - app/test/test_kvargs.c | 37 +++++++++++++++++++++++++++++++++++-- + test/test/test_kvargs.c | 37 +++++++++++++++++++++++++++++++++++-- @@ -26 +27 @@ -diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c +diff --git a/test/test/test_kvargs.c b/test/test/test_kvargs.c @@ -28,2 +29,2 @@ ---- a/app/test/test_kvargs.c -+++ b/app/test/test_kvargs.c +--- a/test/test/test_kvargs.c ++++ b/test/test/test_kvargs.c