From 35740b0b5933041f8218ecd39970a75ca6515c1e Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Tue, 3 Jan 2017 01:25:20 +0100 Subject: [PATCH] Mixer test: fix paths for nuttx --- src/systemcmds/tests/test_mixer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index 897bd98392..f869321205 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -98,9 +98,9 @@ static bool should_prearm = false; #endif #if !defined(CONFIG_ARCH_BOARD_SITL) -#define MIXER_ONBOARD_PATH "/etc/mixers/" +#define MIXER_ONBOARD_PATH "/etc/mixers" #else -#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers/" +#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers" #endif #define MIXER_VERBOSE @@ -217,7 +217,8 @@ bool MixerTest::loadAllTest() char buf[PATH_MAX]; (void)strncpy(&buf[0], MIXER_ONBOARD_PATH, sizeof(buf)); - (void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH)], result->d_name, sizeof(buf) - strlen(MIXER_ONBOARD_PATH)); + (void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH)], "/", 1); + (void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH) + 1], result->d_name, sizeof(buf) - strlen(MIXER_ONBOARD_PATH) - 1); bool ret = load_mixer(buf, 0);