fixes for integration and unit tests

Move ros logs dir so that .ulg files are not in the same directory
(mission_test.py:: get_last_log() fails otherwise)
This commit is contained in:
Beat Küng
2018-08-08 21:09:39 +02:00
committed by Lorenz Meier
parent 0edd7c93e1
commit 5363aff879
9 changed files with 50 additions and 19 deletions
@@ -45,7 +45,7 @@
#ifdef __PX4_NUTTX
#define PX4_MAVLINK_TEST_DATA_DIR "/etc"
#else
#define PX4_MAVLINK_TEST_DATA_DIR "ROMFS/px4fmu_test"
#define PX4_MAVLINK_TEST_DATA_DIR "etc"
#endif
/// @brief Test case file name for Read command. File are generated using mavlink_ftp_test_data.py
+2 -2
View File
@@ -79,8 +79,8 @@ static bool should_prearm = false;
#endif
#if defined(CONFIG_ARCH_BOARD_SITL)
#define MIXER_PATH(_file) "ROMFS/px4fmu_test/mixers/"#_file
#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers"
#define MIXER_PATH(_file) "etc/mixers/"#_file
#define MIXER_ONBOARD_PATH "etc/mixers"
#else
#define MIXER_ONBOARD_PATH "/etc/mixers"
#define MIXER_PATH(_file) MIXER_ONBOARD_PATH"/"#_file