From 9b57694c386c3f44ea4672501c3a0795bf7a16ec Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 21 Sep 2016 13:15:56 +0900 Subject: [PATCH 1/3] travis test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e4d5445474..c306c0ec467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ compiler: # Iterate over 2 different OSs os: - - linux - osx addons: @@ -40,7 +39,7 @@ env: global: - AM_MAKEFLAGS="-j4" - CPPFLAGS="-I$HOME/bogus/include" - - LDFLAGS="-I$HOME/bogus/lib" + - LDFLAGS="-L$HOME/bogus/lib" - LD_LIBRARY_PATH="$HOME/bogus/lib" matrix: - GCC_VERSION=default @@ -53,6 +52,7 @@ before_install: - if [[ "GCC_VERSION" == "6" ]]; then COMPILERS="CC=gcc-6 CXX=g++-6 FC=gfortran-6"; fi - export CONFIGURE_ARGS="--prefix=$HOME/bogus $COMPILERS" DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS" - export DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS" + - echo TRAVIS_OS_NAME=$TRAVIS_OS_NAME GCC_VERSION=$GCC_VERSION - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi From bc89e5f5a4fae288fa706a53beeb2677b3f98511 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 21 Sep 2016 13:21:13 +0900 Subject: [PATCH 2/3] one more test --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c306c0ec467..2cf5e0d745f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew update; brew upgrade automake libtool gcc; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; && [[ "$GCC_VERSION" == "6" ]] ; then brew upgrade gcc; fi - mkdir -p $HOME/bogus/include $HOME/bogus/lib # Note that we use "make -k" to do the entire build, even if there was a From 08e9b0a494c1befec68dcd37dff6baba7ef5b468 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 21 Sep 2016 13:24:53 +0900 Subject: [PATCH 3/3] fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cf5e0d745f..c03989e66fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; && [[ "$GCC_VERSION" == "6" ]] ; then brew upgrade gcc; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew upgrade gcc; fi - mkdir -p $HOME/bogus/include $HOME/bogus/lib # Note that we use "make -k" to do the entire build, even if there was a