Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier 2014-01-13 08:32:58 +01:00
commit eb907c03a1
1 changed files with 9 additions and 7 deletions

View File

@ -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;
}