Commit e85860e5 authored by Frank Rowand's avatar Frank Rowand Committed by Rob Herring

of: unittest: fix EXPECT text for gpio hog errors

The console message text for gpio hog errors does not match
what unittest expects.

Fixes: f4056e70 ("of: unittest: add overlay gpio test to catch gpio hog problem")
Signed-off-by: default avatarFrank Rowand <frank.rowand@sony.com>
Link: https://lore.kernel.org/r/20211029013225.2048695-1-frowand.list@gmail.comSigned-off-by: default avatarRob Herring <robh@kernel.org>
parent b68d0924
...@@ -1688,19 +1688,19 @@ static void __init of_unittest_overlay_gpio(void) ...@@ -1688,19 +1688,19 @@ static void __init of_unittest_overlay_gpio(void)
*/ */
EXPECT_BEGIN(KERN_INFO, EXPECT_BEGIN(KERN_INFO,
"GPIO line <<int>> (line-B-input) hogged as input\n"); "gpio-<<int>> (line-B-input): hogged as input\n");
EXPECT_BEGIN(KERN_INFO, EXPECT_BEGIN(KERN_INFO,
"GPIO line <<int>> (line-A-input) hogged as input\n"); "gpio-<<int>> (line-A-input): hogged as input\n");
ret = platform_driver_register(&unittest_gpio_driver); ret = platform_driver_register(&unittest_gpio_driver);
if (unittest(ret == 0, "could not register unittest gpio driver\n")) if (unittest(ret == 0, "could not register unittest gpio driver\n"))
return; return;
EXPECT_END(KERN_INFO, EXPECT_END(KERN_INFO,
"GPIO line <<int>> (line-A-input) hogged as input\n"); "gpio-<<int>> (line-A-input): hogged as input\n");
EXPECT_END(KERN_INFO, EXPECT_END(KERN_INFO,
"GPIO line <<int>> (line-B-input) hogged as input\n"); "gpio-<<int>> (line-B-input): hogged as input\n");
unittest(probe_pass_count + 2 == unittest_gpio_probe_pass_count, unittest(probe_pass_count + 2 == unittest_gpio_probe_pass_count,
"unittest_gpio_probe() failed or not called\n"); "unittest_gpio_probe() failed or not called\n");
...@@ -1727,7 +1727,7 @@ static void __init of_unittest_overlay_gpio(void) ...@@ -1727,7 +1727,7 @@ static void __init of_unittest_overlay_gpio(void)
chip_request_count = unittest_gpio_chip_request_count; chip_request_count = unittest_gpio_chip_request_count;
EXPECT_BEGIN(KERN_INFO, EXPECT_BEGIN(KERN_INFO,
"GPIO line <<int>> (line-D-input) hogged as input\n"); "gpio-<<int>> (line-D-input): hogged as input\n");
/* overlay_gpio_03 contains gpio node and child gpio hog node */ /* overlay_gpio_03 contains gpio node and child gpio hog node */
...@@ -1735,7 +1735,7 @@ static void __init of_unittest_overlay_gpio(void) ...@@ -1735,7 +1735,7 @@ static void __init of_unittest_overlay_gpio(void)
"Adding overlay 'overlay_gpio_03' failed\n"); "Adding overlay 'overlay_gpio_03' failed\n");
EXPECT_END(KERN_INFO, EXPECT_END(KERN_INFO,
"GPIO line <<int>> (line-D-input) hogged as input\n"); "gpio-<<int>> (line-D-input): hogged as input\n");
unittest(probe_pass_count + 1 == unittest_gpio_probe_pass_count, unittest(probe_pass_count + 1 == unittest_gpio_probe_pass_count,
"unittest_gpio_probe() failed or not called\n"); "unittest_gpio_probe() failed or not called\n");
...@@ -1774,7 +1774,7 @@ static void __init of_unittest_overlay_gpio(void) ...@@ -1774,7 +1774,7 @@ static void __init of_unittest_overlay_gpio(void)
*/ */
EXPECT_BEGIN(KERN_INFO, EXPECT_BEGIN(KERN_INFO,
"GPIO line <<int>> (line-C-input) hogged as input\n"); "gpio-<<int>> (line-C-input): hogged as input\n");
/* overlay_gpio_04b contains child gpio hog node */ /* overlay_gpio_04b contains child gpio hog node */
...@@ -1782,7 +1782,7 @@ static void __init of_unittest_overlay_gpio(void) ...@@ -1782,7 +1782,7 @@ static void __init of_unittest_overlay_gpio(void)
"Adding overlay 'overlay_gpio_04b' failed\n"); "Adding overlay 'overlay_gpio_04b' failed\n");
EXPECT_END(KERN_INFO, EXPECT_END(KERN_INFO,
"GPIO line <<int>> (line-C-input) hogged as input\n"); "gpio-<<int>> (line-C-input): hogged as input\n");
unittest(chip_request_count + 1 == unittest_gpio_chip_request_count, unittest(chip_request_count + 1 == unittest_gpio_chip_request_count,
"unittest_gpio_chip_request() called %d times (expected 1 time)\n", "unittest_gpio_chip_request() called %d times (expected 1 time)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment