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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 1f1c4cff4cef1b647fabcf91aed4341340d8caa4 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>
---
 app/test/test_cycles.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/test/test_cycles.c b/app/test/test_cycles.c
index c78e6a5b1..97d42f303 100644
--- a/app/test/test_cycles.c
+++ b/app/test/test_cycles.c
@@ -79,8 +79,14 @@ REGISTER_TEST_COMMAND(cycles_autotest, test_cycles);
 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;
 }
 
 REGISTER_TEST_COMMAND(delay_us_sleep_autotest, test_delay_us_sleep);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:15.898561098 +0100
+++ 0002-test-cycles-restore-default-delay-callback.patch	2020-08-06 10:53:15.696595342 +0100
@@ -1,8 +1,10 @@
-From ec0b862d5e52db12932c3125d06081307aea6af4 Mon Sep 17 00:00:00 2001
+From 1f1c4cff4cef1b647fabcf91aed4341340d8caa4 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.
@@ -10,7 +12,6 @@
 Restore default delay function after the test to fix the issue.
 
 Fixes: a51639cc720a ("eal: add nanosleep based delay function")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
 Reviewed-by: Gavin Hu <gavin.hu at arm.com>