diff mbox

[U-Boot,02/18] dm: test: Allow test names to leave out the dm_test_ prefix

Message ID 1436208879-8431-3-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass July 6, 2015, 6:54 p.m. UTC 
All driver model tests have a dm_test_ prefix. Ignore it when matching a
test name. This makes it easier to run individual tests, like this:

   ./sandbox/u-boot -d ./sandbox/arch/sandbox/dts/test.dtb \
	-c "ut dm clk_periph"

We can use 'clk_periph' instead of 'dm_test_clk_periph'.

Also print a message if the requested test is not found.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 test/dm/test-main.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Comments

Simon Glass July 17, 2015, 11:58 p.m. UTC | #1 
On 6 July 2015 at 12:54, Simon Glass <sjg@chromium.org> wrote:
> All driver model tests have a dm_test_ prefix. Ignore it when matching a
> test name. This makes it easier to run individual tests, like this:
>
>    ./sandbox/u-boot -d ./sandbox/arch/sandbox/dts/test.dtb \
>         -c "ut dm clk_periph"
>
> We can use 'clk_periph' instead of 'dm_test_clk_periph'.
>
> Also print a message if the requested test is not found.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  test/dm/test-main.c | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)

Applied to u-boot-dm.
diff mbox

Patch

diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 0477d2f..0e43ab9 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -76,6 +76,7 @@  static int dm_test_main(const char *test_name)
 	struct unit_test_state *uts = &global_dm_test_state;
 	uts->priv = &_global_priv_dm_test_state;
 	struct unit_test *test;
+	int run_count;
 
 	/*
 	 * If we have no device tree, or it only has a root node, then these
@@ -90,10 +91,17 @@  static int dm_test_main(const char *test_name)
 	if (!test_name)
 		printf("Running %d driver model tests\n", n_ents);
 
+	run_count = 0;
 	for (test = tests; test < tests + n_ents; test++) {
-		if (test_name && strcmp(test_name, test->name))
+		const char *name = test->name;
+
+		/* All tests have this prefix */
+		if (!strncmp(name, "dm_test_", 8))
+			name += 8;
+		if (test_name && strcmp(test_name, name))
 			continue;
 		printf("Test: %s\n", test->name);
+		run_count++;
 		ut_assertok(dm_test_init(uts));
 
 		uts->start = mallinfo();
@@ -109,7 +117,10 @@  static int dm_test_main(const char *test_name)
 		ut_assertok(dm_test_destroy(uts));
 	}
 
-	printf("Failures: %d\n", uts->fail_count);
+	if (test_name && !run_count)
+		printf("Test '%s' not found\n", test_name);
+	else
+		printf("Failures: %d\n", uts->fail_count);
 
 	gd->dm_root = NULL;
 	ut_assertok(dm_init());