From 7cddb172f66ac8ba50798c9b49e8e1479cf086a2 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 9 Dec 2016 14:04:24 -0800
Subject: [PATCH] travis: use a prefix under $HOME/install

This allows us to "rm -rf $PREFIX" between tests, just to make sure
nothing from the previous build affects the next test.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
---
 .travis.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7153cadef05..29c4e8a26fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,12 @@ addons:
 
 env:
     global:
-        - CPPFLAGS=-I$HOME/include
-        - LDFLAGS=-L$HOME/lib
-        - LD_LIBRARY_PATH=$HOME/lib
-        - LIBFABRIC_CONFIGURE_ARGS="--prefix=$HOME --enable-sockets"
+        - PREFIX=$HOME/install
+        - PATH=$PREFIX/bin:$PATH
+        - CPPFLAGS=-I$PREFIX/include
+        - LDFLAGS=-L$PREFIX/lib
+        - LD_LIBRARY_PATH=$PREFIX/lib
+        - LIBFABRIC_CONFIGURE_ARGS="--prefix=$PREFIX --enable-sockets"
 
 # install dependencies for the usnic providers
 before_install:
@@ -32,8 +34,9 @@ before_install:
 install:
     - ./autogen.sh
     - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "gcc" ]]; then ./configure $LIBFABRIC_CONFIGURE_ARGS --enable-debug && make -j2; fi
-    - ./configure --prefix=$HOME --enable-direct=sockets --enable-udp=no --enable-psm=no --enable-gni=no --enable-psm2=no --enable-verbs=no --enable-usnic=no --enable-rxm=no --enable-rxd=no && make -j2
-    - ./configure --enable-sockets=dl --disable-udp --disable-rxm --disable-rxd --disable-verbs --disable-usnic --prefix=$HOME && make -j2  && make install && make test
+    - ./configure --prefix=$PREFIX --enable-direct=sockets --enable-udp=no --enable-psm=no --enable-gni=no --enable-psm2=no --enable-verbs=no --enable-usnic=no --enable-rxm=no --enable-rxd=no && make -j2
+    - ./configure --enable-sockets=dl --disable-udp --disable-rxm --disable-rxd --disable-verbs --disable-usnic --prefix=$PREFIX && make -j2  && make install && make test
+    - rm -rf $PREFIX
     - ./configure $LIBFABRIC_CONFIGURE_ARGS
     - make -j2
     - make install
@@ -44,7 +47,7 @@ script:
     - git clone https://github.com/ofiwg/fabtests.git
     - cd fabtests
     - ./autogen.sh
-    - ./configure --prefix=$HOME --with-libfabric=$HOME
+    - ./configure --prefix=$PREFIX --with-libfabric=$PREFIX
     - make -j2
     - make install
     - make test