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>master
parent
3a8a02beb7
commit
a72007d999
@ -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 := $(sort $(COBJS-y))
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
|
||||
all: $(LIB) $(XOBJS) |
||||
|
||||
$(LIB): $(obj).depend $(OBJS) |
||||
$(call cmd_link_o_target, $(OBJS))
|
||||
|
||||
#########################################################################
|
||||
|
||||
# defines $(obj).depend target
|
||||
include $(SRCTREE)/rules.mk |
||||
|
||||
sinclude $(obj).depend |
||||
|
||||
#########################################################################
|
@ -0,0 +1,85 @@ |
||||
/*
|
||||
* 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 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 test of command parsers", |
||||
"" |
||||
); |
Loading…
Reference in new issue