diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-03-27 14:43:13 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-03-27 14:43:13 -0400 |
| commit | e644f8c2b18f42f0b19a7c9e2b369a969c619620 (patch) | |
| tree | 5b05dfa156087e553a79ccd965d3188b32de3117 | |
| parent | d1ef25728a04c82ccb2a09882ccb51b53b7bd96f (diff) | |
| download | rneovim-e644f8c2b18f42f0b19a7c9e2b369a969c619620.tar.gz rneovim-e644f8c2b18f42f0b19a7c9e2b369a969c619620.tar.bz2 rneovim-e644f8c2b18f42f0b19a7c9e2b369a969c619620.zip | |
Don't use alias in travis.sh.
We don't want to clobber anyone's make alias when running travis.sh
directly.
| -rwxr-xr-x | scripts/travis.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 8ae9a7a502..aa9ef10fc1 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -23,7 +23,7 @@ check_and_report() { # See: # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM # for more information. -alias make="make -j2" +MAKE_CMD="make -j2" if [ "$CC" = "clang" ]; then # force using the version installed by 'travis-setup.sh' @@ -45,17 +45,17 @@ if [ "$CC" = "clang" ]; then export TSAN_OPTIONS="external_symbolizer_path=$symbolizer:log_path=$tmpdir/tsan" export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works - make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir" - make - if ! make test; then + $MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$install_dir" + $MAKE_CMD + if ! $MAKE_CMD test; then reset check_and_report fi check_and_report - make install + $MAKE_CMD install else export SKIP_EXEC=1 - make CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP" - make cmake - make unittest + $MAKE_CMD CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP" + $MAKE_CMD cmake + $MAKE_CMD unittest fi |