]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'werror' of https://github.com/evverx/util-linux
authorKarel Zak <kzak@redhat.com>
Fri, 3 Jul 2020 09:34:12 +0000 (11:34 +0200)
committerKarel Zak <kzak@redhat.com>
Fri, 3 Jul 2020 09:34:12 +0000 (11:34 +0200)
1  2 
.travis-functions.sh

index b11d9ef60baef9d33914c938820d392ae9550630,7c9619e88bc7697471c8b6b7df1b6dec737a2f2e..a90e8887d2b59ec1af1105091d9496b2ea438a2c
@@@ -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