fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-27 18:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unit tests: Fixed unit test build

Browse Source 
Unit tests now work. The linux build was failing saving params
because it was using the changes for QuRT that fake out the
filesystem.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-05-19 13:36:13 -07:00
parent f44444b7c4
commit 7301b59d14
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/param/param.c
+12 -4
View File
@@ -70,6 +70,14 @@
# define debug(fmt, args...) do { } while(0)
#endif
#ifdef __PX4_QURT
#define PARAM_OPEN px4_open
#define PARAM_CLOSE px4_close
#else
#define PARAM_OPEN open
#define PARAM_CLOSE close
#endif
/**
* Array of static parameter info.
*/
@@ -707,7 +715,7 @@ param_save_default(void)
const char *filename = param_get_default_file();
/* write parameters to temp file */
fd = px4_open(filename, O_WRONLY | O_CREAT, 0x777);
fd = PARAM_OPEN(filename, O_WRONLY | O_CREAT, 0x777);
if (fd < 0) {
warn("failed to open param file: %s", filename);
@@ -720,7 +728,7 @@ param_save_default(void)
warnx("failed to write parameters to file: %s", filename);
}
px4_close(fd);
PARAM_CLOSE(fd);
return res;
}
@@ -732,7 +740,7 @@ int
param_load_default(void)
{
warnx("param_load_default\n");
int fd_load = px4_open(param_get_default_file(), O_RDONLY);
int fd_load = PARAM_OPEN(param_get_default_file(), O_RDONLY);
if (fd_load < 0) {
/* no parameter file is OK, otherwise this is an error */
@@ -745,7 +753,7 @@ param_load_default(void)
}
int result = param_load(fd_load);
px4_close(fd_load);
PARAM_CLOSE(fd_load);
if (result != 0) {
warn("error reading parameters from '%s'", param_get_default_file());