X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=.travis.yml;h=f230fe023a111776e4e0b50d222bd60af4cf39f7;hp=1cf4c59b0df3bb1dfab675d947bbf8a0edd9fd36;hb=bc277979f85299cd681e5a413d63f0c7f1d67beb;hpb=add1f035532a51c360f8461c161406ad94004f29

diff --git a/.travis.yml b/.travis.yml
index 1cf4c59b..f230fe02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,22 @@ before_install:
     - export LIBCDS_BUILD_DIR=`pwd`
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     - sudo apt-get update -qq
+    - export GCC_VERSION=4.9
+    - export BOOST_VERSION=57
 
 install:
-    - sudo apt-get install -qq g++-4.8
-    - export CXX="g++-4.8"
-    - export BOOST_VERSION="57"
+    - sudo apt-get install -qq g++-${GCC_VERSION}
+    - export CXX="g++-${GCC_VERSION}"
     - wget -O boost_1_${BOOST_VERSION}_0.tar.bz2 http://sourceforge.net/projects/boost/files/boost/1.${BOOST_VERSION}.0/boost_1_${BOOST_VERSION}_0.tar.bz2/download
     - tar xjf boost_1_${BOOST_VERSION}_0.tar.bz2
     - cd boost_1_${BOOST_VERSION}_0
     - ./bootstrap.sh
-    - ./b2 --with-thread --with-atomic --with-date_time --with-system --with-timer --stagedir=stage64 --toolset=gcc address-model=64
+    - ./b2 --with-thread --with-atomic --with-date_time --with-system --with-timer --stagedir=stage64 --toolset=gcc-${GCC_VERSION} address-model=64
     - cd ..
 
 before_script: cd ./build
 
-script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-Wall -Wextra -pedantic' --with-boost ../boost_1_${BOOST_VERSION}_0 -t test_hdr
+script: ./build.sh -b 64 -j 2 -x ${CXX} -z '-Wall -Wextra -pedantic -Wno-unused-local-typedefs' --with-boost ../boost_1_${BOOST_VERSION}_0 -t test_hdr
 
 #after_success:
 
@@ -31,12 +32,13 @@ script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-Wall -Wextra -pedantic' --with-boos
 after_script: cd ..
 
 # blacklist
-branches:
-  except:
-    - integration
+#branches:
+#  except:
+#    - integration
 
 # whitelist
 branches:
   only:
     - master
     - dev
+    - integration