travis: minor cosmetics

This is just to make the diff to my private travis script a bit smaller.

Now we always use $CC _after_ the install script which makes it possible
to install/update the compiler in the install section.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/.travis-functions.sh b/.travis-functions.sh
index db50f0997db7a2115495dcd0a777ea4278e863d1..ece05d409cc72ffb7b13ec211ddd280d21483773 100755 (executable)
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -17,8 +17,15 @@ MAKE="make -j2"
 DUMP_CONFIG_LOG="short"
 export TS_OPT_parsable="yes"
 
+# workaround ugly warning on travis OSX,
+# see https://github.com/direnv/direnv/issues/210
+shell_session_update() { :; }
+
 function xconfigure
 {
+       which "$CC"
+       "$CC" --version
+
        ./configure "$@" $OSX_CONFOPTS
        err=$?
        if [ "$DUMP_CONFIG_LOG" = "short" ]; then
@@ -58,7 +65,8 @@ function check_root
        osx_prepare_check
        sudo -E $MAKE check TS_OPTS="$opts" || return
 
-       sudo $MAKE install || return
+       # keep PATH to make sure sudo would find $CC
+       sudo env "PATH=$PATH" $MAKE install || return
 }
 
 function check_dist
@@ -75,8 +83,8 @@ function travis_install_script
                return
        fi
 
-       # install some packages from Ubuntu's default sources
-       sudo apt-get -qq update
+       # install required packages
+       sudo apt-get -qq update --fix-missing
        sudo apt-get install -qq >/dev/null \
                bc \
                btrfs-tools \

diff --git a/.travis.yml b/.travis.yml
index 598b5f13dd15578bf1e01da15264da004364b854..eaed0fa49bd395048d7dfcaae4b99264bcecaddc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ env:
 
 matrix:
   include:
-    - os: linux
-      dist: precise
+    # test old Ubuntu 12.04 and OSX for compatibility
+    - dist: precise
       compiler: gcc
       env: PRECISE="yes" MAKE_CHECK="root"
     - os: osx
@@ -35,10 +35,6 @@ branches:
 before_install:
   # print some host info
   - env | grep -v "encrypted" | LC_ALL=C sort
-  - $CC --version
-  - which $CC
-  # workaround clang not system wide, fail on sudo make install
-  - export CC=`which $CC`
   # workaround travis-ci issue #5301
   - unset PYTHON_CFLAGS