Skip to content

Commit acd80cd

Browse files
groeckkees
authored andcommitted
Revert "kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST"
This reverts commit 4acf1de. Commit d055c6a ("kunit: memcpy: Mark tests as slow using test attributes") marks slow memcpy unit tests as slow. Since this commit, the tests can be disabled with a module parameter, and the configuration option to skip the slow tests is no longer needed. Revert the patch introducing it. Cc: David Gow <[email protected]> Cc: Kees Cook <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]>
1 parent c4ca227 commit acd80cd

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

lib/Kconfig.debug

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,18 +2703,6 @@ config MEMCPY_KUNIT_TEST
27032703

27042704
If unsure, say N.
27052705

2706-
config MEMCPY_SLOW_KUNIT_TEST
2707-
bool "Include exhaustive memcpy tests"
2708-
depends on MEMCPY_KUNIT_TEST
2709-
default y
2710-
help
2711-
Some memcpy tests are quite exhaustive in checking for overlaps
2712-
and bit ranges. These can be very slow, so they are split out
2713-
as a separate config, in case they need to be disabled.
2714-
2715-
Note this config option will be replaced by the use of KUnit test
2716-
attributes.
2717-
27182706
config IS_SIGNED_TYPE_KUNIT_TEST
27192707
tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS
27202708
depends on KUNIT

lib/memcpy_kunit.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,6 @@ static void set_random_nonzero(struct kunit *test, u8 *byte)
309309

310310
static void init_large(struct kunit *test)
311311
{
312-
if (!IS_ENABLED(CONFIG_MEMCPY_SLOW_KUNIT_TEST))
313-
kunit_skip(test, "Slow test skipped. Enable with CONFIG_MEMCPY_SLOW_KUNIT_TEST=y");
314-
315312
/* Get many bit patterns. */
316313
get_random_bytes(large_src, ARRAY_SIZE(large_src));
317314

0 commit comments

Comments
 (0)