diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-08 12:45:43 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-08 12:45:43 +0100 |
| commit | aa2a00b56a0be0e20abfa54c311575f9e055f212 (patch) | |
| tree | 7c13065632d45486c31eee5c08b8de58c36335fc /unittests | |
| parent | 1df7939072f87a5f3f3cc05ff57f545db7c144ad (diff) | |
| parent | e405fafe882c95345ccf88ea5f372f353aa4c21f (diff) | |
| download | px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.tar.gz px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.tar.bz2 px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.zip | |
Merge branch 'MixerNaming' of github.com:anton-matosov/Firmware
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/conversion_test.cpp | 2 | ||||
| -rw-r--r-- | unittests/mixer_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittests/conversion_test.cpp b/unittests/conversion_test.cpp index 99e1c7721..12d2213e2 100644 --- a/unittests/conversion_test.cpp +++ b/unittests/conversion_test.cpp @@ -4,6 +4,6 @@ #include "gtest/gtest.h" -TEST(ConversionTest, FMU_quad_w) { +TEST(ConversionTest, quad_w_main) { ASSERT_EQ(test_conv(0, NULL), 0) << "Conversion test failed"; } diff --git a/unittests/mixer_test.cpp b/unittests/mixer_test.cpp index fd3ece7f8..1271dab5e 100644 --- a/unittests/mixer_test.cpp +++ b/unittests/mixer_test.cpp @@ -6,6 +6,6 @@ TEST(MixerTest, Mixer) { - char* args[] = {"empty", "../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../ROMFS/px4fmu_common/mixers/FMU_quad_w.mix"}; + char* args[] = {"empty", "../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../ROMFS/px4fmu_common/mixers/quad_w.main.mix"}; ASSERT_EQ(test_mixer(3, args), 0) << "IO_pass.mix failed"; } |