summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-14 12:40:15 -0600
committerTom Rini <trini@ti.com>2014-09-24 18:30:28 -0400
commit8969ea3e9f2db04a6b36758972b708837786a5a5 (patch)
tree46d33fb323e71e7f2dd2391dc00b35dde05a0366 /common
parentb84505210367d152a456a2adeba90e13626ad104 (diff)
downloadu-boot-imx-8969ea3e9f2db04a6b36758972b708837786a5a5.zip
u-boot-imx-8969ea3e9f2db04a6b36758972b708837786a5a5.tar.gz
u-boot-imx-8969ea3e9f2db04a6b36758972b708837786a5a5.tar.bz2
sandbox: Disable Ctrl-C
This is not supported properly on sandbox, and interferes with running tests, since when a test script is piped in, some commands will call ctrlc() which will drop characters from the test script. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/console.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c
index 898da39..5a2f411 100644
--- a/common/console.c
+++ b/common/console.c
@@ -524,6 +524,7 @@ static int ctrlc_disabled = 0; /* see disable_ctrl() */
static int ctrlc_was_pressed = 0;
int ctrlc(void)
{
+#ifndef CONFIG_SANDBOX
if (!ctrlc_disabled && gd->have_console) {
if (tstc()) {
switch (getc()) {
@@ -535,6 +536,8 @@ int ctrlc(void)
}
}
}
+#endif
+
return 0;
}
/* Reads user's confirmation.