aboutsummaryrefslogtreecommitdiff
path: root/src/systemcmds
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-13 08:32:58 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-13 08:32:58 +0100
commiteb907c03a1e077a053c4ba20c554ab576af487ba (patch)
tree9bfaba3df17d4cd3a3a984ff1565ac43f9c2986e /src/systemcmds
parent5a0c6353690a903b0cbf03aee7cb040726f25fd8 (diff)
parent8205afc4e0ab8bd7b95abb21dee56f61feafc11e (diff)
downloadpx4-firmware-eb907c03a1e077a053c4ba20c554ab576af487ba.tar.gz
px4-firmware-eb907c03a1e077a053c4ba20c554ab576af487ba.tar.bz2
px4-firmware-eb907c03a1e077a053c4ba20c554ab576af487ba.zip
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/systemcmds')
-rw-r--r--src/systemcmds/tests/test_file.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/systemcmds/tests/test_file.c b/src/systemcmds/tests/test_file.c
index 7206b87d6..83d09dd5e 100644
--- a/src/systemcmds/tests/test_file.c
+++ b/src/systemcmds/tests/test_file.c
@@ -54,9 +54,9 @@
#include "tests.h"
-int check_user_abort();
+int check_user_abort(int fd);
-int check_user_abort() {
+int check_user_abort(int fd) {
/* check if user wants to abort */
char c;
@@ -77,6 +77,8 @@ int check_user_abort() {
case 'q':
{
warnx("Test aborted.");
+ fsync(fd);
+ close(fd);
return OK;
/* not reached */
}
@@ -141,7 +143,7 @@ test_file(int argc, char *argv[])
fsync(fd);
- if (!check_user_abort())
+ if (!check_user_abort(fd))
return OK;
}
@@ -175,7 +177,7 @@ test_file(int argc, char *argv[])
return 1;
}
- if (!check_user_abort())
+ if (!check_user_abort(fd))
return OK;
}
@@ -199,7 +201,7 @@ test_file(int argc, char *argv[])
return 1;
}
- if (!check_user_abort())
+ if (!check_user_abort(fd))
return OK;
}
@@ -232,7 +234,7 @@ test_file(int argc, char *argv[])
break;
}
- if (!check_user_abort())
+ if (!check_user_abort(fd))
return OK;
}
@@ -275,7 +277,7 @@ test_file(int argc, char *argv[])
break;
}
- if (!check_user_abort())
+ if (!check_user_abort(fd))
return OK;
}