Skip to content

Commit 2bac112

Browse files
committed
sysctl: call sysctl tests with a for loop
As we add more test functions in lib/tests_sysctl the main test function (test_sysctl_init) grows. Condense the logic to make it easier to add/remove tests. Reviewed-by: Kees Cook <kees@kernel.org> Signed-off-by: Joel Granados <joel.granados@kernel.org>
1 parent 8e4acab commit 2bac112

1 file changed

Lines changed: 11 additions & 19 deletions

File tree

lib/test_sysctl.c

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -301,27 +301,19 @@ static int test_sysctl_register_u8_extra(void)
301301

302302
static int __init test_sysctl_init(void)
303303
{
304-
int err;
305-
306-
err = test_sysctl_setup_node_tests();
307-
if (err)
308-
goto out;
309-
310-
err = test_sysctl_run_unregister_nested();
311-
if (err)
312-
goto out;
313-
314-
err = test_sysctl_run_register_mount_point();
315-
if (err)
316-
goto out;
317-
318-
err = test_sysctl_run_register_empty();
319-
if (err)
320-
goto out;
304+
int err = 0;
305+
306+
int (*func_array[])(void) = {
307+
test_sysctl_setup_node_tests,
308+
test_sysctl_run_unregister_nested,
309+
test_sysctl_run_register_mount_point,
310+
test_sysctl_run_register_empty,
311+
test_sysctl_register_u8_extra
312+
};
321313

322-
err = test_sysctl_register_u8_extra();
314+
for (int i = 0; !err && i < ARRAY_SIZE(func_array); i++)
315+
err = func_array[i]();
323316

324-
out:
325317
return err;
326318
}
327319
module_init(test_sysctl_init);

0 commit comments

Comments
 (0)