Skip to content

Commit 4cdde87

Browse files
schladhtejun
authored andcommitted
selftests: cgroup: Use values_close_report in test_cpu
Convert test_cpu to use the newly added values_close_report() helper to print detailed diagnostics when a tolerance check fails. This provides clearer insight into deviations while run in the CI. Signed-off-by: Sebastian Chlad <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
1 parent 3f9c60f commit 4cdde87

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tools/testing/selftests/cgroup/test_cpu.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static int test_cpucg_stats(const char *root)
219219
if (user_usec <= 0)
220220
goto cleanup;
221221

222-
if (!values_close(usage_usec, expected_usage_usec, 1))
222+
if (!values_close_report(usage_usec, expected_usage_usec, 1))
223223
goto cleanup;
224224

225225
ret = KSFT_PASS;
@@ -291,7 +291,7 @@ static int test_cpucg_nice(const char *root)
291291

292292
user_usec = cg_read_key_long(cpucg, "cpu.stat", "user_usec");
293293
nice_usec = cg_read_key_long(cpucg, "cpu.stat", "nice_usec");
294-
if (!values_close(nice_usec, expected_nice_usec, 1))
294+
if (!values_close_report(nice_usec, expected_nice_usec, 1))
295295
goto cleanup;
296296

297297
ret = KSFT_PASS;
@@ -404,7 +404,7 @@ overprovision_validate(const struct cpu_hogger *children, int num_children)
404404
goto cleanup;
405405

406406
delta = children[i + 1].usage - children[i].usage;
407-
if (!values_close(delta, children[0].usage, 35))
407+
if (!values_close_report(delta, children[0].usage, 35))
408408
goto cleanup;
409409
}
410410

@@ -444,7 +444,7 @@ underprovision_validate(const struct cpu_hogger *children, int num_children)
444444
int ret = KSFT_FAIL, i;
445445

446446
for (i = 0; i < num_children - 1; i++) {
447-
if (!values_close(children[i + 1].usage, children[0].usage, 15))
447+
if (!values_close_report(children[i + 1].usage, children[0].usage, 15))
448448
goto cleanup;
449449
}
450450

@@ -573,16 +573,16 @@ run_cpucg_nested_weight_test(const char *root, bool overprovisioned)
573573

574574
nested_leaf_usage = leaf[1].usage + leaf[2].usage;
575575
if (overprovisioned) {
576-
if (!values_close(leaf[0].usage, nested_leaf_usage, 15))
576+
if (!values_close_report(leaf[0].usage, nested_leaf_usage, 15))
577577
goto cleanup;
578-
} else if (!values_close(leaf[0].usage * 2, nested_leaf_usage, 15))
578+
} else if (!values_close_report(leaf[0].usage * 2, nested_leaf_usage, 15))
579579
goto cleanup;
580580

581581

582582
child_usage = cg_read_key_long(child, "cpu.stat", "usage_usec");
583583
if (child_usage <= 0)
584584
goto cleanup;
585-
if (!values_close(child_usage, nested_leaf_usage, 1))
585+
if (!values_close_report(child_usage, nested_leaf_usage, 1))
586586
goto cleanup;
587587

588588
ret = KSFT_PASS;
@@ -691,7 +691,7 @@ static int test_cpucg_max(const char *root)
691691
expected_usage_usec
692692
= n_periods * quota_usec + MIN(remainder_usec, quota_usec);
693693

694-
if (!values_close(usage_usec, expected_usage_usec, 10))
694+
if (!values_close_report(usage_usec, expected_usage_usec, 10))
695695
goto cleanup;
696696

697697
ret = KSFT_PASS;
@@ -762,7 +762,7 @@ static int test_cpucg_max_nested(const char *root)
762762
expected_usage_usec
763763
= n_periods * quota_usec + MIN(remainder_usec, quota_usec);
764764

765-
if (!values_close(usage_usec, expected_usage_usec, 10))
765+
if (!values_close_report(usage_usec, expected_usage_usec, 10))
766766
goto cleanup;
767767

768768
ret = KSFT_PASS;

0 commit comments

Comments
 (0)