[dpdk-stable] patch 'test/cycles: restore default delay callback' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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/cd89b1b7c32e558898bfb81af0f166ace3f01a6f

Thanks.

Kevin.

---
>From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Mon, 27 Jul 2020 18:21:50 +0800
Subject: [PATCH] test/cycles: restore default delay callback

[ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ]

test_delay_us_sleep registers sleep based delay for testing.
This changes the default delay function of testing environment.
It is not expected.

Restore default delay function after the test to fix the issue.

Fixes: a51639cc720a ("eal: add nanosleep based delay function")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
---
 test/test/test_cycles.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c
index c78e6a5b12..97d42f3032 100644
--- a/test/test/test_cycles.c
+++ b/test/test/test_cycles.c
@@ -80,6 +80,12 @@ static int
 test_delay_us_sleep(void)
 {
+	int rv;
+
 	rte_delay_us_callback_register(rte_delay_us_sleep);
-	return check_wait_one_second();
+	rv = check_wait_one_second();
+	/* restore original delay function */
+	rte_delay_us_callback_register(rte_delay_us_block);
+
+	return rv;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.423272735 +0100
+++ 0020-test-cycles-restore-default-delay-callback.patch	2020-08-28 11:03:25.946955632 +0100
@@ -1 +1 @@
-From ec0b862d5e52db12932c3125d06081307aea6af4 Mon Sep 17 00:00:00 2001
+From cd89b1b7c32e558898bfb81af0f166ace3f01a6f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ec0b862d5e52db12932c3125d06081307aea6af4 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
- app/test/test_cycles.c | 8 +++++++-
+ test/test/test_cycles.c | 8 +++++++-
@@ -21 +22 @@
-diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
+diff --git a/test/test/test_cycles.c b/test/test/test_cycles.c
@@ -23,2 +24,2 @@
---- a/app/test/test_cycles.c
-+++ b/app/test/test_cycles.c
+--- a/test/test/test_cycles.c
++++ b/test/test/test_cycles.c