Merge branch 'develop' into tune-plugin

mavlink · Oct 21, 2019 · 082e5d3 · 082e5d3
2 parents 86a865c + 5a25399
commit 082e5d3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 73 deletions.
diff --git a/src/integration_tests/mavlink_passthrough.cpp b/src/integration_tests/mavlink_passthrough.cpp
@@ -60,7 +60,7 @@ TEST_F(SitlTest, MavlinkPassthrough)
 
                 LogInfo() << "HIGHRES_IMU.temperature [1] (" << counter << ")"
                           << highres_imu.temperature << " degrees C";
-                if (++counter > 100) {
+                if (++counter == 100) {
                     EXPECT_FALSE(stopped);
                     if (!stopped) {
                         stopped = true;

diff --git a/third_party/boringssl/CMakeLists.txt b/third_party/boringssl/CMakeLists.txt
diff --git a/third_party/openssl/CMakeLists.txt b/third_party/openssl/CMakeLists.txt