An error snuck in between two recent conflicting changes:
Until recently ->setup() used negative values to indicate
normal test termination. This was changed in
commit fa10366cc6f4 ("selftests/resctrl: Allow ->setup() to return
errors") that transitioned ->setup() to use negative values
to indicate errors and a new END_OF_TESTS to indicate normal
termination.
commit 42e3b093eb7c ("selftests/resctrl: Fix set up schemata with 100%
allocation on first run in MBM test") continued to use
negative return to indicate normal test termination.
Fix mbm_setup() to use the new END_OF_TESTS to indicate
error-free test termination.
Fixes: 42e3b093eb7c ("selftests/resctrl: Fix set up schemata with 100% allocation on first run in MBM test")
Reported-by: Ilpo Järvinen <[email protected]>
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Reinette Chatre <[email protected]>
---
Hi Shuah,
Apologies, this error snuck in between the two series
merged into kselftest's next this week.
tools/testing/selftests/resctrl/mbm_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c
index 146132fa986d..538d35a6485a 100644
--- a/tools/testing/selftests/resctrl/mbm_test.c
+++ b/tools/testing/selftests/resctrl/mbm_test.c
@@ -98,7 +98,7 @@ static int mbm_setup(int num, ...)
/* Run NUM_OF_RUNS times */
if (p->num_of_runs >= NUM_OF_RUNS)
- return -1;
+ return END_OF_TESTS;
/* Set up shemata with 100% allocation on the first run. */
if (p->num_of_runs == 0)
--
2.34.1
On 4/14/23 10:43, Reinette Chatre wrote:
> An error snuck in between two recent conflicting changes:
> Until recently ->setup() used negative values to indicate
> normal test termination. This was changed in
> commit fa10366cc6f4 ("selftests/resctrl: Allow ->setup() to return
> errors") that transitioned ->setup() to use negative values
> to indicate errors and a new END_OF_TESTS to indicate normal
> termination.
>
> commit 42e3b093eb7c ("selftests/resctrl: Fix set up schemata with 100%
> allocation on first run in MBM test") continued to use
> negative return to indicate normal test termination.
>
> Fix mbm_setup() to use the new END_OF_TESTS to indicate
> error-free test termination.
>
> Fixes: 42e3b093eb7c ("selftests/resctrl: Fix set up schemata with 100% allocation on first run in MBM test")
> Reported-by: Ilpo Järvinen <[email protected]>
> Link: https://lore.kernel.org/lkml/[email protected]/
> Signed-off-by: Reinette Chatre <[email protected]>
> ---
> Hi Shuah,
>
> Apologies, this error snuck in between the two series
> merged into kselftest's next this week.
>
No worries. This is now applied on top of others to linux-kselftest
net.
thanks,
-- Shuah
On 4/14/2023 10:16 AM, Shuah Khan wrote:
>
> No worries. This is now applied on top of others to linux-kselftest
> net.
Thank you very much Shuah.
Reinette