From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>
Subject: [PATCH 19/21] test: Update time tests to use unit-test asserts
Date: Mon, 28 Oct 2024 13:41:24 +0100 [thread overview]
Message-ID: <20241028124130.32072-20-sjg@chromium.org> (raw)
In-Reply-To: <20241028124130.32072-1-sjg@chromium.org>
Rather than returning various error codes, use assertions to check that
the test passes.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
test/lib/time.c | 31 +++++++------------------------
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/test/lib/time.c b/test/lib/time.c
index 2095bef7589..b99e738c500 100644
--- a/test/lib/time.c
+++ b/test/lib/time.c
@@ -22,11 +22,7 @@ static int test_get_timer(struct unit_test_state *uts)
next = get_timer(0);
} while (start == next);
- if (start + 1 != next) {
- printf("%s: iter=%d, start=%lu, next=%lu, expected a difference of 1\n",
- __func__, iter, start, next);
- return -EINVAL;
- }
+ ut_asserteq(start + 1, next);
start++;
}
@@ -35,11 +31,7 @@ static int test_get_timer(struct unit_test_state *uts)
* an extra millisecond may have passed.
*/
diff = get_timer(base);
- if (diff != iter && diff != iter + 1) {
- printf("%s: expected get_timer(base) to match elapsed time: diff=%lu, expected=%d\n",
- __func__, diff, iter);
- return -EINVAL;
- }
+ ut_assert(diff == iter || diff == iter + 1);
return 0;
}
@@ -57,11 +49,8 @@ static int test_timer_get_us(struct unit_test_state *uts)
next = timer_get_us();
if (next != prev) {
delta = next - prev;
- if (delta < 0) {
- printf("%s: timer_get_us() went backwards from %lu to %lu\n",
- __func__, prev, next);
- return -EINVAL;
- } else if (delta != 0) {
+ ut_assert(delta >= 0);
+ if (delta) {
if (delta < min)
min = delta;
prev = next;
@@ -70,11 +59,7 @@ static int test_timer_get_us(struct unit_test_state *uts)
}
}
- if (min != 1) {
- printf("%s: Minimum microsecond delta should be 1 but is %lu\n",
- __func__, min);
- return -EINVAL;
- }
+ ut_asserteq(1, min);
return 0;
}
@@ -95,8 +80,7 @@ static int test_time_comparison(struct unit_test_state *uts)
error = delta_us - 1000000;
printf("%s: Microsecond time for 1 second: %lu, error = %ld\n",
__func__, delta_us, error);
- if (abs(error) > 1000)
- return -EINVAL;
+ ut_assert(abs(error) <= 1000);
return 0;
}
@@ -115,8 +99,7 @@ static int test_udelay(struct unit_test_state *uts)
error = delta - 1000;
printf("%s: Delay time for 1000 udelay(1000): %lu ms, error = %ld\n",
__func__, delta, error);
- if (abs(error) > 100)
- return -EINVAL;
+ ut_assert(abs(error) <= 100);
return 0;
}
--
2.43.0
next prev parent reply other threads:[~2024-10-28 12:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 12:41 [PATCH 00/21] test: Tidy up the test/ directory Simon Glass
2024-10-28 12:41 ` [PATCH 01/21] bloblist: test: Move test into common Simon Glass
2024-11-01 21:46 ` Tom Rini
2024-11-02 16:32 ` Simon Glass
2024-10-28 12:41 ` [PATCH 02/21] bloblist: test: Drop global_data declarations Simon Glass
2024-10-28 12:41 ` [PATCH 03/21] bloblist: test: doc: Move into the common suite Simon Glass
2024-10-28 19:33 ` Tom Rini
2024-10-29 15:45 ` Simon Glass
2024-10-29 16:36 ` Tom Rini
2024-10-31 18:00 ` Simon Glass
2024-10-31 18:10 ` Tom Rini
2024-11-01 15:32 ` Simon Glass
2024-11-01 16:47 ` Tom Rini
2024-10-28 12:41 ` [PATCH 04/21] test: Drop test-trace.sh and common.sh Simon Glass
2024-10-28 12:41 ` [PATCH 05/21] compression: test: Move test into lib Simon Glass
2024-10-28 12:41 ` [PATCH 06/21] compression: test: Move into the lib suite Simon Glass
2024-10-28 12:41 ` [PATCH 07/21] command_ut: test: Move test into lib Simon Glass
2024-10-28 12:41 ` [PATCH 08/21] command: test: Move into the cmd suite Simon Glass
2024-10-28 12:41 ` [PATCH 09/21] test: Update command test to use unit-test functions Simon Glass
2024-10-28 12:41 ` [PATCH 10/21] bootm: test: Move test into boot Simon Glass
2024-10-28 12:41 ` [PATCH 11/21] test: Move print_ut test into common Simon Glass
2024-10-28 12:41 ` [PATCH 12/21] test: Move print_ut into the common suite Simon Glass
2024-10-28 12:41 ` [PATCH 13/21] test: Move str_ut test into lib Simon Glass
2024-10-28 12:41 ` [PATCH 14/21] str: test: Move into the lib suite Simon Glass
2024-10-28 12:41 ` [PATCH 15/21] test: Move unicode_ut test into lib Simon Glass
2024-10-28 12:41 ` [PATCH 16/21] test: Move unicode tests into the lib suite Simon Glass
2024-10-28 12:41 ` [PATCH 17/21] test: Move time_ut test into lib Simon Glass
2024-10-28 12:41 ` [PATCH 18/21] test: Move time tests into the lib suite Simon Glass
2024-10-28 12:41 ` Simon Glass [this message]
2024-10-28 12:41 ` [PATCH 20/21] test: Correct display of failing test Simon Glass
2024-10-28 12:41 ` [PATCH 21/21] test: Quote test names Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241028124130.32072-20-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.