From 8ee7fd9586282c4a0368d562491dc4c93f87f605 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Tue, 14 Sep 2021 20:40:46 +0200
Subject: [PATCH] Don't build with -Werror by default

This is annoying and wrong for releases and distro packages. Explicitly
enable it for CI instead.
---
 meson.build      | 3 +--
 tests/run-alpine | 2 +-
 tests/run-apt    | 4 ++--
 tests/run-dnf    | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index c8aab610..95c66d66 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,6 @@
 project('umockdev', 'c', 'vala',
   version: run_command('sed', '-rn', '1 { s/^.*\[([0-9.]+)\].*/\\1/; p }', 'NEWS').stdout().strip(),
-  license: 'LGPLv2.1+',
-  default_options: ['werror=true'])
+  license: 'LGPLv2.1+')
 
 srcdir = meson.current_source_dir() / 'src'
 testsdir = meson.current_source_dir() / 'tests'
diff --git a/tests/run-alpine b/tests/run-alpine
index 025a84be..c664f960 100755
--- a/tests/run-alpine
+++ b/tests/run-alpine
@@ -21,7 +21,7 @@ apk add --no-cache meson gcc musl-dev glib-dev eudev-dev libpcap-dev make vala l
 su -s /bin/sh - guest << EOG
 set -ex
 cd /source
-meson setup /tmp/dbg --buildtype debug
+meson setup /tmp/dbg --buildtype debug --werror
 meson test -C /tmp/dbg -v --num-processes=1
 DESTDIR=/tmp/inst meson install -C /tmp/dbg
 echo "===== tests done; install tree: ===="
diff --git a/tests/run-apt b/tests/run-apt
index d8e58f77..50a3ba8f 100755
--- a/tests/run-apt
+++ b/tests/run-apt
@@ -35,7 +35,7 @@ useradd build
 su -s /bin/sh - build << EOG
 set -ex
 cd /source
-meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=true
+meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=true --werror
 cd /tmp/dbg
 if meson dist --help | grep -q no-tests; then
     meson dist --no-test
@@ -61,7 +61,7 @@ fi
 su - build <<EOG
 set -ex
 cd /source
-meson setup /tmp/rel --buildtype release -Db_ndebug=true --prefix /usr -Dgtk_doc=true
+meson setup /tmp/rel --buildtype release -Db_ndebug=true --prefix /usr -Dgtk_doc=true --werror
 meson test -C /tmp/rel -v --num-processes=1
 EOG
 
diff --git a/tests/run-dnf b/tests/run-dnf
index 1dfebe8e..6489622a 100755
--- a/tests/run-dnf
+++ b/tests/run-dnf
@@ -38,7 +38,7 @@ useradd guest
 su -s /bin/sh - guest << EOG
 set -eux
 cd /source
-meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=\${gtk_doc} -Db_coverage=\$coverage
+meson setup /tmp/dbg --buildtype debug --prefix /usr -Dgtk_doc=\${gtk_doc} -Db_coverage=\$coverage --werror
 cd /tmp/dbg
 DESTDIR=/tmp/inst meson install
 meson test -v --num-processes=1
@@ -50,7 +50,7 @@ fi
 
 # build with clang
 cd /source
-CC=clang meson setup /tmp/clang -Dgtk_doc=false
+CC=clang meson setup /tmp/clang -Dgtk_doc=false --werror
 meson test -C /tmp/clang -v --num-processes=1
 EOG