Split up test_hash_init so that it calls each test more explicitly insofar it is possible without rewriting the entire file. This aims at improving readability.
Split tests performed on string_or as they don't interfere with those performed in hash_or. Also separate pr_info calls about skipped tests as they're not part of the tests themselves, but only warn about (un)defined arch-specific hash functions.
Signed-off-by: Isabella Basso isabellabdoamaral@usp.br --- lib/test_hash.c | 65 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 11 deletions(-)
diff --git a/lib/test_hash.c b/lib/test_hash.c index ed75c768c231..c168823b0963 100644 --- a/lib/test_hash.c +++ b/lib/test_hash.c @@ -152,8 +152,37 @@ test_int_hash(unsigned long long h64) return true; }
-static int __init -test_hash_init(void) +static int __init test_string_or(void) +{ + char buf[SIZE+1]; + int i, j; + u32 h0; + + string_or = 0; + fill_buf(buf, SIZE, 1); + + /* Test every possible non-empty substring in the buffer. */ + for (j = SIZE; j > 0; j--) { + buf[j] = '\0'; + + for (i = 0; i <= j; i++) { + h0 = full_name_hash(buf+i, buf+i, j-i); + + string_or |= h0; + } /* i */ + } /* j */ + + /* The OR of all the hash values should cover all the bits */ + if (~string_or) { + pr_err("OR of all string hash results = %#x != %#x", + string_or, -1u); + return -EINVAL; + } + + return 0; +} + +static int __init test_hash_or(void) { char buf[SIZE+1]; unsigned tests = 0; @@ -186,7 +215,6 @@ test_hash_init(void) return -EINVAL; }
- string_or |= h0; h64 = h64 << 32 | h0; /* For use with hash_64 */ if (!test_int_hash(h64)) return -EINVAL; @@ -194,12 +222,6 @@ test_hash_init(void) } /* i */ } /* j */
- /* The OR of all the hash values should cover all the bits */ - if (~string_or) { - pr_err("OR of all string hash results = %#x != %#x", - string_or, -1u); - return -EINVAL; - } if (~hash_or[0][0]) { pr_err("OR of all __hash_32 results = %#x != %#x", hash_or[0][0], -1u); @@ -231,6 +253,13 @@ test_hash_init(void) } }
+ pr_notice("%u tests passed.", tests); + + return 0; +} + +static void __init notice_skipped_tests(void) +{ /* Issue notices about skipped tests. */ #ifdef HAVE_ARCH__HASH_32 #if HAVE_ARCH__HASH_32 != 1 @@ -246,10 +275,24 @@ test_hash_init(void) #else pr_info("hash_64() has no arch implementation to test."); #endif +}
- pr_notice("%u tests passed.", tests); +static int __init +test_hash_init(void) +{ + int ret;
- return 0; + ret = test_string_or(); + if (ret < 0) + return ret; + + ret = test_hash_or(); + if (ret < 0) + return ret; + + notice_skipped_tests(); + + return ret; }
static void __exit test_hash_exit(void)