[dpdk-stable] patch 'test: skip some subtests in no-huge mode' has been queued to LTS release 18.11.9

[Kevin Traynor]

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/17ee228d0a1f677a92b86c39cccf4a19d7e75c21

Thanks.

Kevin.

---
>From 17ee228d0a1f677a92b86c39cccf4a19d7e75c21 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Mon, 23 Mar 2020 20:59:23 +0100
Subject: [PATCH] test: skip some subtests in no-huge mode

[ upstream commit 27fb5dd2850c60b46660b93c2fe14da6841b142c ]

When running with '--no-huge' flag, tests failed with messages as:
    ACL context creation with invalid NUMA should have failed!
    fbk hash creation should have failed
    test_table_pipeline: Check pipeline invalid params failed.

These cases test against invalid socket ID as input parameter, and
expect error return. But function calls return success because
invalid sock ID is overwritten to SOCKET_ID_ANY when in no-huge mode.

The tests against invalid socket ID are skipped in no-huge mode.

Fixes: 5640171c528a ("malloc: fix external heap allocation in no-huge mode")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Acked-by: Yipeng Wang <yipeng1.wang at intel.com>
---
 test/test/test_acl.c            | 20 +++++++++++---------
 test/test/test_hash.c           |  7 +++++--
 test/test/test_table_pipeline.c | 12 +++++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/test/test/test_acl.c b/test/test/test_acl.c
index b1f75d1bc7..4fedcf446f 100644
--- a/test/test/test_acl.c
+++ b/test/test/test_acl.c
@@ -1395,14 +1395,16 @@ test_invalid_parameters(void)
 		rte_acl_free(acx);
 
-	/* invalid NUMA node */
-	memcpy(&param, &acl_param, sizeof(param));
-	param.socket_id = RTE_MAX_NUMA_NODES + 1;
+	if (rte_eal_has_hugepages()) {
+		/* invalid NUMA node */
+		memcpy(&param, &acl_param, sizeof(param));
+		param.socket_id = RTE_MAX_NUMA_NODES + 1;
 
-	acx = rte_acl_create(&param);
-	if (acx != NULL) {
-		printf("Line %i: ACL context creation with invalid NUMA "
-				"should have failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
+		acx = rte_acl_create(&param);
+		if (acx != NULL) {
+			printf("Line %i: ACL context creation with invalid "
+					"NUMA should have failed!\n", __LINE__);
+			rte_acl_free(acx);
+			return -1;
+		}
 	}
 
diff --git a/test/test/test_hash.c b/test/test/test_hash.c
index fe607fadf2..ea711b1f10 100644
--- a/test/test/test_hash.c
+++ b/test/test/test_hash.c
@@ -1047,6 +1047,9 @@ fbk_hash_unit_test(void)
 	RETURN_IF_ERROR_FBK(handle != NULL, "fbk hash creation should have failed");
 
-	handle = rte_fbk_hash_create(&invalid_params_8);
-	RETURN_IF_ERROR_FBK(handle != NULL, "fbk hash creation should have failed");
+	if (rte_eal_has_hugepages()) {
+		handle = rte_fbk_hash_create(&invalid_params_8);
+		RETURN_IF_ERROR_FBK(handle != NULL,
+					"fbk hash creation should have failed");
+	}
 
 	handle = rte_fbk_hash_create(&invalid_params_same_name_1);
diff --git a/test/test/test_table_pipeline.c b/test/test/test_table_pipeline.c
index 441338ac01..bc412c3081 100644
--- a/test/test/test_table_pipeline.c
+++ b/test/test/test_table_pipeline.c
@@ -191,9 +191,11 @@ check_pipeline_invalid_params(void)
 	}
 
-	p = rte_pipeline_create(&pipeline_params_3);
-	if (p != NULL) {
-		RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with invalid "
-			"socket\n", __func__);
-		goto fail;
+	if (rte_eal_has_hugepages()) {
+		p = rte_pipeline_create(&pipeline_params_3);
+		if (p != NULL) {
+			RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with "
+				"invalid socket\n", __func__);
+			goto fail;
+		}
 	}
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.374401684 +0100
+++ 0023-test-skip-some-subtests-in-no-huge-mode.patch	2020-05-28 17:12:59.084556785 +0100
@@ -1 +1 @@
-From 27fb5dd2850c60b46660b93c2fe14da6841b142c Mon Sep 17 00:00:00 2001
+From 17ee228d0a1f677a92b86c39cccf4a19d7e75c21 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 27fb5dd2850c60b46660b93c2fe14da6841b142c ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -25,3 +26,3 @@
- app/test/test_acl.c            | 20 +++++++++++---------
- app/test/test_hash.c           |  7 +++++--
- app/test/test_table_pipeline.c | 12 +++++++-----
+ test/test/test_acl.c            | 20 +++++++++++---------
+ test/test/test_hash.c           |  7 +++++--
+ test/test/test_table_pipeline.c | 12 +++++++-----
@@ -30,5 +31,5 @@
-diff --git a/app/test/test_acl.c b/app/test/test_acl.c
-index 501de35da1..316bf4d065 100644
---- a/app/test/test_acl.c
-+++ b/app/test/test_acl.c
-@@ -1398,14 +1398,16 @@ test_invalid_parameters(void)
+diff --git a/test/test/test_acl.c b/test/test/test_acl.c
+index b1f75d1bc7..4fedcf446f 100644
+--- a/test/test/test_acl.c
++++ b/test/test/test_acl.c
+@@ -1395,14 +1395,16 @@ test_invalid_parameters(void)
@@ -60,5 +61,5 @@
-diff --git a/app/test/test_hash.c b/app/test/test_hash.c
-index fbd5725c68..ab978ea689 100644
---- a/app/test/test_hash.c
-+++ b/app/test/test_hash.c
-@@ -1137,6 +1137,9 @@ fbk_hash_unit_test(void)
+diff --git a/test/test/test_hash.c b/test/test/test_hash.c
+index fe607fadf2..ea711b1f10 100644
+--- a/test/test/test_hash.c
++++ b/test/test/test_hash.c
+@@ -1047,6 +1047,9 @@ fbk_hash_unit_test(void)
@@ -76 +77 @@
-diff --git a/app/test/test_table_pipeline.c b/app/test/test_table_pipeline.c
+diff --git a/test/test/test_table_pipeline.c b/test/test/test_table_pipeline.c
@@ -78,2 +79,2 @@
---- a/app/test/test_table_pipeline.c
-+++ b/app/test/test_table_pipeline.c
+--- a/test/test/test_table_pipeline.c
++++ b/test/test/test_table_pipeline.c