diff options
author | Ruediger Meier | 2018-03-06 23:58:41 +0100 |
---|---|---|
committer | Ruediger Meier | 2018-03-07 18:31:55 +0100 |
commit | 277d61b9f4931a3b0f3099df8d23acc7940b23ed (patch) | |
tree | 903f7417fa2a4753deb5e00d37ed1e30fe85422d | |
parent | Merge branch 'setpriv-caps' of https://github.com/yrro/util-linux (diff) | |
download | kernel-qcow2-util-linux-277d61b9f4931a3b0f3099df8d23acc7940b23ed.tar.gz kernel-qcow2-util-linux-277d61b9f4931a3b0f3099df8d23acc7940b23ed.tar.xz kernel-qcow2-util-linux-277d61b9f4931a3b0f3099df8d23acc7940b23ed.zip |
travis: enable osx root checks
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
-rwxr-xr-x | .travis-functions.sh | 3 | ||||
-rw-r--r-- | .travis.yml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh index f0a0d8990..d92927e77 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -79,6 +79,9 @@ function check_root osx_prepare_check sudo -E $MAKE check TS_OPTS="$opts" || return + # root on osx has not enough permission for make install ;) + [ "$TRAVIS_OS_NAME" = "osx" ] && return + # keep PATH to make sure sudo would find $CC sudo env "PATH=$PATH" $MAKE install || return } diff --git a/.travis.yml b/.travis.yml index eaed0fa49..169596c64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - os: osx osx_image: xcode7.3 compiler: clang - env: MAKE_CHECK="nonroot" + env: MAKE_CHECK="root" branches: only: |