From ac0988d519bc5aed837eda743a87d2f7dfd0f1b7 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Wed, 1 Aug 2018 13:50:42 -0400
Subject: [PATCH] travis-ci coverity properly run and submit scan

 - the ignored warning (-Wno-missing-field-initializers) can be dropped in the future when GCC 4.8 is no longer supported
---
 .travis.yml                 | 12 +-----------
 cmake/common/px4_base.cmake |  3 +--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37e1739ac0..fcc1e11f63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,20 +7,10 @@ git:
 matrix:
   fast_finish: true
   include:
-    - env: BUILD_TARGET=coverity_scan
+    - os: linux
       if: branch = coverity_scan
-      os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 
 before_install:
-    - eval "${MATRIX_EVAL}"
     - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
 
 install:
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 3b4d110f30..0b5b361094 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -347,8 +347,6 @@ function(px4_add_common_flags)
 		-Winit-self
 		-Wlogical-op
 		-Wmissing-declarations
-		-Wmissing-field-initializers
-
 		-Wpointer-arith
 		-Wshadow
 		-Wuninitialized
@@ -356,6 +354,7 @@ function(px4_add_common_flags)
 		-Wunused-variable
 
 		-Wno-implicit-fallthrough # set appropriate level and update
+		-Wno-missing-field-initializers
 		-Wno-missing-include-dirs # TODO: fix and enable
 		-Wno-unused-parameter
 		)