cmd: Add test and fix bugs for dm drivers

Add a test for the dm drivers command. Also fix a null pointer dereference
revealed by said test.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/dm.c b/cmd/dm.c
index 108707c298a4d6fb35e148b7768e34bdd796b8b4..7a90685f8b66f451d837bcbb52b6fcc21ea92805 100644 (file)
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -41,7 +41,7 @@ static int do_dm_dump_devres(cmd_tbl_t *cmdtp, int flag, int argc,
 }
 
 static int do_dm_dump_drivers(cmd_tbl_t *cmdtp, int flag, int argc,
-                              char * const argv[])
+                             char * const argv[])
 {
        dm_dump_drivers();
 
@@ -94,5 +94,5 @@ U_BOOT_CMD(
        "tree          Dump driver model tree ('*' = activated)\n"
        "dm uclass        Dump list of instances for each uclass\n"
        "dm devres        Dump list of device resources for each device\n"
-       "dm drivers       Dump list of drivers and their compatible strings\n"
+       "dm drivers       Dump list of drivers and their compatible strings"
 );

diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index e73ebeabcc9a6a8d2bb876d4b1390b8e9fc976bd..b5046398d4c6664ca4edd42ea1ec148b8befc3e2 100644 (file)
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -107,7 +107,8 @@ void dm_dump_drivers(void)
        puts("Driver                Compatible\n");
        puts("--------------------------------\n");
        for (entry = d; entry < d + n_ents; entry++) {
-               for (match = entry->of_match; match->compatible; match++)
+               for (match = entry->of_match;
+                    match && match->compatible; match++)
                        printf("%-20.20s  %s\n",
                               match == entry->of_match ? entry->name : "",
                               match->compatible);

diff --git a/test/py/tests/test_dm.py b/test/py/tests/test_dm.py
new file mode 100644 (file)
index 0000000..f6fbf8b
--- /dev/null
+++ b/test/py/tests/test_dm.py
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 Sean Anderson
+
+import pytest
+
+@pytest.mark.buildconfigspec('cmd_dm')
+def test_dm_drivers(u_boot_console):
+    """Test that each driver in `dm tree` is also listed in `dm drivers`."""
+    response = u_boot_console.run_command('dm tree')
+    driver_index = response.find('Driver')
+    assert driver_index != -1
+    drivers = (line[driver_index:].split()[0]
+               for line in response[:-1].split('\n')[2:])
+
+    response = u_boot_console.run_command('dm drivers')
+    for driver in drivers:
+        assert driver in response