kfence-test-use-kunit_skip-to-skip-tests.patch removed from -mm tree
The patch titled
Subject: kfence: test: use kunit_skip() to skip tests
has been removed from the -mm tree. Its filename was
kfence-test-use-kunit_skip-to-skip-tests.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Marco Elver <[email protected]>
Subject: kfence: test: use kunit_skip() to skip tests
Use the new kunit_skip() to skip tests if requirements were not met. It makes it easier to see in KUnit's summary if there were skipped tests.
Signed-off-by Marco Elver <[email protected]>
Reviewed-by David Gow <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Aleksandr Nogikh <[email protected]>
Cc Taras Madan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/kfence/kfence_test.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
mm/kfence/kfence_test.c renamed from mm/kfence/kfence_test.c~kfence-test-use-kunit_skip-to-skip-tests +8 -6
@@ -32,6 +32,11 @@#define arch_kfence_test_address (addr) (addr)#endif +#define KFENCE_TEST_REQUIRES (test, cond) do { \ + if (!(cond)) \ + kunit_skip((test), "Test requires: " #cond); \ +} while (0) +/* Report as observed from console. */ static struct { spinlock_t lock;
@@ -555,8 +560,7 @@ static void test_init_on_free(struct kun };int i; -if (!IS_ENABLED (CONFIG_INIT_ON_FREE_DEFAULT_ON )) -return ; +KFENCE_TEST_REQUIRES (test,IS_ENABLED (CONFIG_INIT_ON_FREE_DEFAULT_ON ));/* Assume it hasn't been disabled on command line. */ setup_test_cache (test, size,0 ,NULL );
@@ -603,10 +607,8 @@ static void test_gfpzero(struct kunit *tchar *buf1, *buf2;int i; -if (CONFIG_KFENCE_SAMPLE_INTERVAL >100 ) { -kunit_warn (test,"skipping ... would take too long\n" ); -return ; - } +/* Skip if we think it'd take too long. */ +KFENCE_TEST_REQUIRES (test,CONFIG_KFENCE_SAMPLE_INTERVAL <=100 );setup_test_cache (test, size,0 ,NULL ); buf1 =test_alloc (test, size,GFP_KERNEL ,ALLOCATE_ANY );
_
Patches currently in -mm which might be from [email protected] are