Merge pull request #112 from Statoil/build-allow-cxx-warnings

Allow warnings for cxx
equinor · May 30, 2018 · 39fd1fc · 39fd1fc
2 parents 1e8ae31 + 44fac41
commit 39fd1fc
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/travis/build_total.py b/travis/build_total.py
@@ -23,7 +23,7 @@ def call(args):
         exit('subprocess.call error:\n\tcode %d\n\targs %s' % (status, arg_str))
 
 
-def build(source_dir, install_dir, test, c_flags="", test_flags=None):
+def build(source_dir, install_dir, test, c_flags, cxx_flags, test_flags=None):
     build_dir = os.path.join(source_dir, "build")
     if not os.path.isdir(build_dir):
         os.makedirs(build_dir)
@@ -208,23 +208,29 @@ def compile_ecl(self, basedir, install_dir):
 
         test = (self.repository == 'ecl')
         c_flags = "-Werror=all"
-        build(source_dir, install_dir, test, c_flags=c_flags, test_flags=self.test_flags)
+        cxx_flags = "-Werror -Wno-unused-result"
+        build(source_dir, install_dir, test, c_flags, cxx_flags, test_flags=self.test_flags)
 
     def compile_res(self, basedir, install_dir):
         if self.repository == 'res':
             source_dir = basedir
         else:
             source_dir = os.path.join(basedir, "libres")
         test = (self.repository in ('ecl', 'res'))
+
         # TODO add c_flags = "-Werror=all"
-        build(source_dir, install_dir, test, test_flags=self.test_flags)
+        c_flags = ""
+        cxx_flags = ""
+        build(source_dir, install_dir, test, c_flags, cxx_flags, test_flags=self.test_flags)
 
     def compile_ert(self, basedir, install_dir):
         if self.repository == 'ert':
             source_dir = basedir
         else:
             source_dir = os.path.join(basedir, "ert")
-        build(source_dir, install_dir, True, test_flags=self.test_flags)
+        c_flags = ""
+        cxx_flags = ""
+        build(source_dir, install_dir, True, c_flags, cxx_flags, test_flags=self.test_flags)
 
 
 def main():