summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJonathan Lebon <jlebon@redhat.com>2017-10-03 21:34:43 +0000
committerAtomic Bot <atomic-devel@projectatomic.io>2017-10-04 12:54:53 +0000
commit8a61f5423952db275c99876b273a8fb32f761eb1 (patch)
tree4712c1ce2db58c99329cbcb28df9378e064fb5ae /ci
parent43977dffdea5d2a640e9c0abd01c20b5d4a726f2 (diff)
downloadostree-8a61f5423952db275c99876b273a8fb32f761eb1.tar.gz
ci: really turn on warnings
We didn't have `-Wall` in our `CFLAGS`. It's normally injected by `configure.ac`, but because we *did* have `-Werror`, it was skipped. Now, we just turn it on unconditionally directly in `build.sh`. Closes: #1245 Approved by: cgwalters
Diffstat (limited to 'ci')
-rwxr-xr-xci/build-check.sh9
-rwxr-xr-xci/build.sh7
2 files changed, 8 insertions, 8 deletions
diff --git a/ci/build-check.sh b/ci/build-check.sh
index cb9dbb83..2f4ddaba 100755
--- a/ci/build-check.sh
+++ b/ci/build-check.sh
@@ -28,14 +28,13 @@ if test -x /usr/bin/gnome-desktop-testing-runner; then
gnome-desktop-testing-runner -L ${resultsdir}/gdtr-results -p 0 ${INSTALLED_TESTS_PATTERN:-libostree/}
fi
+# And now a clang build to find unused variables because it does a better
+# job than gcc for vars with cleanups; perhaps in the future these could
+# parallelize
if test -x /usr/bin/clang; then
- # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
# Except for clang-4.0: error: argument unused during compilation: '-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1' [-Werror,-Wunused-command-line-argument]
- export CFLAGS="-Wno-error=unused-command-line-argument -Werror ${CFLAGS:-}"
+ export CFLAGS="-Wall -Werror -Wno-error=unused-command-line-argument ${CFLAGS:-}"
git clean -dfx && git submodule foreach git clean -dfx
- # And now a clang build to find unused variables because it does a better
- # job than gcc for vars with cleanups; perhaps in the future these could
- # parallelize
export CC=clang
build
fi
diff --git a/ci/build.sh b/ci/build.sh
index 572ae197..b56f57c6 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -18,9 +18,6 @@ if test -n "${CI_PKGS:-}"; then
fi
pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang
-# always fail on warnings; https://github.com/ostreedev/ostree/pull/971
-export CFLAGS="-Werror ${CFLAGS:-}"
-
# Default libcurl on by default in fedora unless libsoup is enabled
if sh -c '. /etc/os-release; test "${ID}" = fedora'; then
case "${CONFIGOPTS:-}" in
@@ -36,4 +33,8 @@ case "${CONFIGOPTS:-}" in
;;
esac
+# always fail on warnings; https://github.com/ostreedev/ostree/pull/971
+# NB: this disables the default set of flags from configure.ac
+export CFLAGS="-Wall -Werror ${CFLAGS:-}"
+
build --enable-gtk-doc ${CONFIGOPTS:-}