sandbox: Allow selection of SPL unit tests

Now that we have more than one test, add a way to select the test to run.

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

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index 48fd1265afee3b43905a4bdedd6e9beba370ef58..81b217a1d70f0d67c8c8ba2d089799e213fdfcb2 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -72,7 +72,7 @@ void spl_board_init(void)
        if (state->run_unittests) {
                int ret;
 
-               ret = dm_test_main(NULL);
+               ret = dm_test_main(state->select_unittests);
                /* continue execution into U-Boot */
        }
 }

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index f5e104b127bc0c4682c1ea2ec57f58113cb249ae..569dafbcfeed364001275b290d47492275b55c52 100644 (file)
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -383,6 +383,15 @@ static int sandbox_cmdline_cb_unittests(struct sandbox_state *state,
 }
 SANDBOX_CMDLINE_OPT_SHORT(unittests, 'u', 0, "Run unit tests");
 
+static int sandbox_cmdline_cb_select_unittests(struct sandbox_state *state,
+                                              const char *arg)
+{
+       state->select_unittests = arg;
+
+       return 0;
+}
+SANDBOX_CMDLINE_OPT_SHORT(select_unittests, 'k', 1, "Select unit tests to run");
+
 static void setup_ram_buf(struct sandbox_state *state)
 {
        /* Zero the RAM buffer if we didn't read it, to keep valgrind happy */

diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index f828d9d2447756dd5bdc94f86f88a2b3041b15c7..7547602dd1c96cc60ae974bcbbcbe29ecab0db8f 100644 (file)
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -93,6 +93,7 @@ struct sandbox_state {
        bool show_of_platdata;          /* Show of-platdata in SPL */
        bool ram_buf_read;              /* true if we read the RAM buffer */
        bool run_unittests;             /* Run unit tests */
+       const char *select_unittests;   /* Unit test to run */
 
        /* Pointer to information for each SPI bus/cs */
        struct sandbox_spi_info spi[CONFIG_SANDBOX_SPI_MAX_BUS]