X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=.travis.yml;h=f230fe023a111776e4e0b50d222bd60af4cf39f7;hb=46d71b0be93217b5daaa9f1aee8301b1ce7f0f4d;hp=c19e68257d362dd7a8c15ea0f89de92b355497d8;hpb=b6566fce5b1df538adb96a0acb2c14b4051c0228;p=libcds.git

diff --git a/.travis.yml b/.travis.yml
index c19e6825..f230fe02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,44 @@
 
 language: cpp
-compiler: clang
+compiler: g++
 #  - gcc
 #  - clang
-#before_install:
-#install:
+
+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++-${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-${GCC_VERSION} address-model=64
+    - cd ..
+
 before_script: cd ./build
-script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-std=c++0x -Wall -Wextra -pedantic' -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:
+
 #after_failure:
+
 after_script: cd ..
 
 # blacklist
-branches:
-  except:
-    - integration
+#branches:
+#  except:
+#    - integration
 
 # whitelist
 branches:
   only:
     - master
     - dev
+    - integration