From 76d3a9d92e7ffd19364ffbad2b907ad38c2b2bb0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Aug 2022 16:59:06 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"ANDROID:=20GKI:=20Add=20=E2=80=98kuni?= =?UTF-8?q?t.enable=E2=80=99=20module=20parameter"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 25de28e49ec9adc096420ea5c7ca2b694de10a36 as it conflicts with upstream kunit changes in 6.0-rc1. If it is still needed, please submit it usptream as it is adding a new user/kernel api for some unknown reason. Bug: 231160619 Cc: Joe Fradley Signed-off-by: Greg Kroah-Hartman Change-Id: I12650bf4ca232cf416969c1b032003df80125ffc --- lib/kunit/test.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 197316352258..a5053a07409f 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -52,13 +52,6 @@ void __kunit_fail_current_test(const char *file, int line, const char *fmt, ...) EXPORT_SYMBOL_GPL(__kunit_fail_current_test); #endif -/* - * Enable KUnit tests to run. - */ -static bool enable_param; -module_param_named(enable, enable_param, bool, 0); -MODULE_PARM_DESC(enable, "Enable KUnit tests to run"); - /* * KUnit statistic mode: * 0 - disabled @@ -592,12 +585,6 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites) { unsigned int i; - if (!enable_param) { - pr_info("kunit: deactivated, cannot load %s\n", - suites != NULL ? suites[0]->name : "NULL"); - return -1; - } - for (i = 0; suites[i] != NULL; i++) { kunit_init_suite(suites[i]); kunit_run_tests(suites[i]); @@ -615,9 +602,6 @@ void __kunit_test_suites_exit(struct kunit_suite **suites) { unsigned int i; - if (!enable_param) - return; - for (i = 0; suites[i] != NULL; i++) kunit_exit_suite(suites[i]);