From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Jul 2020 09:34:12 +0000 (+0200)
Subject: Merge branch 'werror' of https://github.com/evverx/util-linux
X-Git-Tag: v2.36-rc2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc270ae1a841e1d5b89592e567b1c7676083aac7;p=thirdparty%2Futil-linux.git

Merge branch 'werror' of https://github.com/evverx/util-linux
---

bc270ae1a841e1d5b89592e567b1c7676083aac7
diff --cc .travis-functions.sh
index b11d9ef60b,7c9619e88b..a90e8887d2
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@@ -70,10 -70,14 +70,14 @@@ function check_nonroo
  		--enable-all-programs"
  
  	if [ "$TRAVIS_OS_NAME" != "osx" ]; then
 -		conf_opts="$conf_opts --enable-asan"
 -		make_opts="$make_opts --memcheck-asan"
 +		conf_opts="$conf_opts --enable-asan --enable-ubsan"
 +		make_opts="$make_opts --memcheck-asan --memcheck-ubsan"
  	fi
  
+ 	if [ "$TRAVIS_OS_NAME" != "osx" -a "$TRAVIS_DIST" != "precise" ]; then
+ 		conf_opts="$conf_opts --enable-werror"
+ 	fi
+ 
  	xconfigure $conf_opts || return
  	$MAKE || return
  
@@@ -93,10 -97,14 +97,14 @@@ function check_roo
  	local conf_opts="--enable-all-programs"
  
  	if [ "$TRAVIS_OS_NAME" != "osx" ]; then
 -		conf_opts="$conf_opts --enable-asan"
 -		make_opts="$make_opts --memcheck-asan"
 +		conf_opts="$conf_opts --enable-asan --enable-ubsan"
 +		make_opts="$make_opts --memcheck-asan --memcheck-ubsan"
  	fi
  
+ 	if [ "$TRAVIS_OS_NAME" != "osx" -a "$TRAVIS_DIST" != "precise" ]; then
+ 		conf_opts="$conf_opts --enable-werror"
+ 	fi
+ 
  	xconfigure $conf_opts || return
  	$MAKE || return