Since run_command() and run_command_list() are important and a little confusing, add some basic tests to check that the behaviour is correct.
Note: I am not sure that this should be committed, nor where it should go in the source tree. Comments welcome.
To run the unit tests use the ut_cmd command available in sandbox:
make sandbox_config make ./u-boot -c ut_cmd
(To test both hush and built-in parsers, you need to manually change CONFIG_SYS_HUSH_PARSER in include/configs/sandbox.h and build/run again)
Signed-off-by: Simon Glass sjg@chromium.org --- Changes in v3: - Add some unit tests for run_command() and run_command_list()
Changes in v4: - Add some unit tests for run_command() and run_command_list() - Fix code nits in unit test and test/Makefile
Makefile | 1 + test/Makefile | 45 +++++++++++++++++++++++++++ test/command_ut.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 0 deletions(-) create mode 100644 test/Makefile create mode 100644 test/command_ut.c
diff --git a/Makefile b/Makefile index 351a8f0..d2bd97a 100644 --- a/Makefile +++ b/Makefile @@ -301,6 +301,7 @@ LIBS += common/libcommon.o LIBS += lib/libfdt/libfdt.o LIBS += api/libapi.o LIBS += post/libpost.o +LIBS += test/libtest.o
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 0000000..871c484 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,45 @@ +# +# (C) Copyright 2012 The Chromium Authors +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)libtest.o + +COBJS-$(CONFIG_SANDBOX) += command_ut.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/test/command_ut.c b/test/command_ut.c new file mode 100644 index 0000000..50da638 --- /dev/null +++ b/test/command_ut.c @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2012, The Chromium Authors + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* Define this to make sure that our assert()s will activate */ +#define DEBUG + +#include <common.h> + +static const char test_cmd[] = + "setenv list 1\n setenv list ${list}2; " + "setenv list ${list}3\0" + "setenv list ${list}4"; + +static int do_ut_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + printf("%s: Testing commands\n", __func__); + run_command("env default -f", 0); + + /* run a single command */ + run_command("setenv single 1", 0); + assert(!strcmp("1", getenv("single"))); + + /* make sure that compound statements work */ +#ifdef CONFIG_SYS_HUSH_PARSER + run_command("if test -n ${single} ; then setenv check 1; fi", 0); + assert(!strcmp("1", getenv("check"))); + run_command("setenv check", 0); +#endif + + /* commands separated by ; */ + run_command_list("setenv list 1; setenv list ${list}1", -1, 0); + assert(!strcmp("11", getenv("list"))); + + /* commands separated by \n */ + run_command_list("setenv list 1\n setenv list ${list}1", -1, 0); + assert(!strcmp("11", getenv("list"))); + + /* command followed by \n and nothing else */ + run_command_list("setenv list 1${list}\n", -1, 0); + assert(!strcmp("111", getenv("list"))); + + /* three commands in a row */ + run_command_list("setenv list 1\n setenv list ${list}2; " + "setenv list ${list}3", -1, 0); + assert(!strcmp("123", getenv("list"))); + + /* a command string with \0 in it. Stuff after \0 should be ignored */ + run_command("setenv list", 0); + run_command_list(test_cmd, sizeof(test_cmd), 0); + assert(!strcmp("123", getenv("list"))); + + /* + * a command list where we limit execution to only the first command + * using the length parameter. + */ + run_command_list("setenv list 1\n setenv list ${list}2; " + "setenv list ${list}3", strlen("setenv list 1"), 0); + assert(!strcmp("1", getenv("list"))); + + printf("%s: Everything went swimmingly\n", __func__); + return 0; +} + +U_BOOT_CMD( + ut_cmd, 5, 1, do_ut_cmd, + "Very basic unit test of command parsers", + "" +);