diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:30 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:30 +0100 |
commit | fb151a855f22e407eaa49db42851c90b6f1333f5 (patch) | |
tree | bda3de1a91b72d3ff9b06919c261b3ec37cfa83d /unittests/conversion_test.cpp | |
parent | bb0d04212f31051fe4b71848c0a3b8adeb9b6e39 (diff) | |
parent | aa2a00b56a0be0e20abfa54c311575f9e055f212 (diff) | |
download | px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.gz px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.bz2 px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.zip |
Merge remote-tracking branch 'upstream/master' into ros
Diffstat (limited to 'unittests/conversion_test.cpp')
-rw-r--r-- | unittests/conversion_test.cpp | 2 |
1 files changed, 1 insertions, 1 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"; } |