diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-08 20:20:21 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-08 20:20:21 +0100 |
commit | f82656203a16451b9d7136ad24beba7ccc8b135f (patch) | |
tree | 37d04f5cc3e0b583f658a8e2ce3d0902662c5704 | |
parent | fed5a2daae3298ba097b4e7b406168928fc7816b (diff) | |
parent | 4e4e5a0323e586e5b7c28e3fbc29ef69185518d6 (diff) | |
download | px4-firmware-f82656203a16451b9d7136ad24beba7ccc8b135f.tar.gz px4-firmware-f82656203a16451b9d7136ad24beba7ccc8b135f.tar.bz2 px4-firmware-f82656203a16451b9d7136ad24beba7ccc8b135f.zip |
Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests
-rw-r--r-- | src/systemcmds/tests/test_file.c | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/src/systemcmds/tests/test_file.c b/src/systemcmds/tests/test_file.c index 419e8d5e9..7206b87d6 100644 --- a/src/systemcmds/tests/test_file.c +++ b/src/systemcmds/tests/test_file.c @@ -40,6 +40,7 @@ */ #include <sys/stat.h> +#include <poll.h> #include <dirent.h> #include <stdio.h> #include <stddef.h> @@ -53,6 +54,38 @@ #include "tests.h" +int check_user_abort(); + +int check_user_abort() { + /* check if user wants to abort */ + char c; + + struct pollfd fds; + int ret; + fds.fd = 0; /* stdin */ + fds.events = POLLIN; + ret = poll(&fds, 1, 0); + + if (ret > 0) { + + read(0, &c, 1); + + switch (c) { + case 0x03: // ctrl-c + case 0x1b: // esc + case 'c': + case 'q': + { + warnx("Test aborted."); + return OK; + /* not reached */ + } + } + } + + return 1; +} + int test_file(int argc, char *argv[]) { @@ -108,6 +141,9 @@ test_file(int argc, char *argv[]) fsync(fd); + if (!check_user_abort()) + return OK; + } end = hrt_absolute_time(); @@ -139,6 +175,9 @@ test_file(int argc, char *argv[]) return 1; } + if (!check_user_abort()) + return OK; + } /* @@ -149,7 +188,7 @@ test_file(int argc, char *argv[]) int ret = unlink("/fs/microsd/testfile"); fd = open("/fs/microsd/testfile", O_TRUNC | O_WRONLY | O_CREAT); - warnx("testing aligned writes - please wait.."); + warnx("testing aligned writes - please wait.. (CTRL^C to abort)"); start = hrt_absolute_time(); for (unsigned i = 0; i < iterations; i++) { @@ -160,6 +199,9 @@ test_file(int argc, char *argv[]) return 1; } + if (!check_user_abort()) + return OK; + } fsync(fd); @@ -189,6 +231,9 @@ test_file(int argc, char *argv[]) align_read_ok = false; break; } + + if (!check_user_abort()) + return OK; } if (!align_read_ok) { @@ -229,6 +274,9 @@ test_file(int argc, char *argv[]) if (unalign_read_err_count > 10) break; } + + if (!check_user_abort()) + return OK; } if (!unalign_read_ok) { |