diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-02-06 15:37:31 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-02-15 14:34:06 -0700 |
| commit | 88539e4431cd6a596da316f81b644c4df606dbd9 (patch) | |
| tree | 25c39cd598ff62bb20e17eb3a9c08de3f734f61d /arch/sandbox/cpu | |
| parent | d908898333b22fb2345a7a165ff837fa6b947b0b (diff) | |
| download | talos-obmc-uboot-88539e4431cd6a596da316f81b644c4df606dbd9.tar.gz talos-obmc-uboot-88539e4431cd6a596da316f81b644c4df606dbd9.zip | |
sandbox: Return '-c command' exit value as sandbox exit code
When a command is passed into sandbox using the '-c' argument the
command is run directly. This is most helpful when running tests (such
as test-dm.sh). Previously the exit code was an unused enum. Change it
to be the actual return code from the command so that the script calling
sandbox can know if the command succeeded (tests passed). Also remove
the now completely unused "exit_state" in sandbox.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox/cpu')
| -rw-r--r-- | arch/sandbox/cpu/start.c | 6 | ||||
| -rw-r--r-- | arch/sandbox/cpu/state.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 097f29a290..ec010402d7 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -78,11 +78,13 @@ int sandbox_main_loop_init(void) /* Execute command if required */ if (state->cmd) { + int retval; + cli_init(); - run_command_list(state->cmd, -1, 0); + retval = run_command_list(state->cmd, -1, 0); if (!state->interactive) - os_exit(state->exit_type); + os_exit(retval); } return 0; diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index ba73b7e251..033958ce74 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -13,11 +13,6 @@ static struct sandbox_state main_state; static struct sandbox_state *state; /* Pointer to current state record */ -void state_record_exit(enum exit_type_id exit_type) -{ - state->exit_type = exit_type; -} - static int state_ensure_space(int extra_size) { void *blob = state->state_fdt; |
