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 F24E9A0093 for ; Tue, 19 May 2020 15:00:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EAD661D61A; Tue, 19 May 2020 15:00:03 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 28E611D610 for ; Tue, 19 May 2020 15:00:02 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id u188so3471873wmu.1 for ; Tue, 19 May 2020 06:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAA9vbKvqRf60/7KNN6C0moFwQVu5sOXqXFbUyAJ8FM=; b=S+m62ob6VPxBRFfl35JSxoNdWPz3wNLGkkBKcF0+H2VRgUtbDuKsuveUWQ1+sxN0u7 g1BghCjQqxRjwPuooV80aiGvS6Lc9z4ZEXIr0MDqU5gcjpvyfz1P6E8+bbwzyH4prlOI ujHfSmmD5Q5IgOg9B5DItgOZVPwbiIvcMgObzZz4xiHzwKqnvPoQ+kXY+ESXBWimN67s eikLal3ler1B0ifBMjuBzK3iCgswH56Q+RYJacfdQEo+QgU9OUvuRjvtx4/mCqX/7eTD 8iY08PE+TCh2TpqK17inbcyTUoKKhgh1Ef87CXAmiYCwjHzZhPnG/aJfXGXOJ3oWmUWU 6wOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zAA9vbKvqRf60/7KNN6C0moFwQVu5sOXqXFbUyAJ8FM=; b=R1kukeVnj3bTJaOrGpJiNd/nDY2S3anZ1gg+41eapAM37jUv64VSn/wAxAoEYBTi87 5WK7oKYorlNNcnp8QFrCatz5fGTLPRvJJsWdhF7EX79BOJzcL5NClmqAcOjEfjtrVdKh oxE3SLEEm+KGFmE/b6Mv3m5B4wDLoqNEx00DS0DNaO0p9Pd+PWCUhYwuvjPtcyAa42zy nzRiZ8WU7msyq3K28LpCAa8yhiF+m+YKyUTTcwPsNlGXGRi1VS/iYiTkraunxhR2GtBE Z2RUUaE/wHjP6IIwO73jOiQMSqszdsIfDPwDmuVWgtA0fkh+a8DZUhwZgOfF5QZbBur2 4L3g== X-Gm-Message-State: AOAM530teJ0pgx4lPCPSZ1xaHekvu3CaIpOcThQuYI/pLFZIcgKAwoFb lKJgr0Ntu7tIyKXbV9uL8M4tVDuOHZERHnVT X-Google-Smtp-Source: ABdhPJxh8an4bczTSiWZwpfVwq25Q4FsiLRoJfG3gXjHoiYEKGRcKwLNyoK1QtDfjwVFYEQ8abDHUg== X-Received: by 2002:a1c:2089:: with SMTP id g131mr5114971wmg.47.1589893201860; Tue, 19 May 2020 06:00:01 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l12sm22980562wrh.20.2020.05.19.06.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: David Marchand , dpdk stable Date: Tue, 19 May 2020 13:54:04 +0100 Message-Id: <20200519125804.104349-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/kvargs: fix to consider empty elements as valid' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From bcdd4476cd9993262c14686653e75ea54be16e2c 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 --- app/test/test_kvargs.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c index a42056f361..d3db88a57a 100644 --- a/app/test/test_kvargs.c +++ b/app/test/test_kvargs.c @@ -142,7 +142,7 @@ static int test_valid_kvargs(void) valid_keys = valid_keys_list; kvlist = rte_kvargs_parse(args, valid_keys); if (kvlist == NULL) { - printf("rte_kvargs_parse() error"); + printf("rte_kvargs_parse() error\n"); goto fail; } if (strcmp(kvlist->pairs[0].value, "[0,1]") != 0) { @@ -157,6 +157,40 @@ 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; fail: @@ -179,7 +213,6 @@ static int test_invalid_kvargs(void) const char *args_list[] = { "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 */ "foo=[1,2", /* no closing bracket in value */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:21.051207701 +0100 +++ 0054-test-kvargs-fix-to-consider-empty-elements-as-valid.patch 2020-05-19 13:56:18.287503043 +0100 @@ -1,8 +1,10 @@ -From 55fa01f7edfc9d2fa5af57ffb8991750fbdb1528 Mon Sep 17 00:00:00 2001 +From bcdd4476cd9993262c14686653e75ea54be16e2c 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: "" @@ -15,7 +17,6 @@ explain why the tests were not failing. It is fixed in the next commit. Fixes: e495f5435524 ("kvargs: add test case in app/test") -Cc: stable@dpdk.org Signed-off-by: Olivier Matz Reviewed-by: David Marchand