Changed pqueue stress-test params for debug mode

[libcds.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1cf4c59b0df3bb1dfab675d947bbf8a0edd9fd36..f230fe023a111776e4e0b50d222bd60af4cf39f7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,22 @@ before_install:
     - export LIBCDS_BUILD_DIR=`pwd`\r
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test\r
     - sudo apt-get update -qq\r
+    - export GCC_VERSION=4.9\r
+    - export BOOST_VERSION=57\r
 \r
 install:\r
-    - sudo apt-get install -qq g++-4.8\r
-    - export CXX="g++-4.8"\r
-    - export BOOST_VERSION="57"\r
+    - sudo apt-get install -qq g++-${GCC_VERSION}\r
+    - export CXX="g++-${GCC_VERSION}"\r
     - 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\r
     - tar xjf boost_1_${BOOST_VERSION}_0.tar.bz2\r
     - cd boost_1_${BOOST_VERSION}_0\r
     - ./bootstrap.sh\r
-    - ./b2 --with-thread --with-atomic --with-date_time --with-system --with-timer --stagedir=stage64 --toolset=gcc address-model=64\r
+    - ./b2 --with-thread --with-atomic --with-date_time --with-system --with-timer --stagedir=stage64 --toolset=gcc-${GCC_VERSION} address-model=64\r
     - cd ..\r
 \r
 before_script: cd ./build\r
 \r
-script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-Wall -Wextra -pedantic' --with-boost ../boost_1_${BOOST_VERSION}_0 -t test_hdr\r
+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\r
 \r
 #after_success:\r
 \r
@@ -31,12 +32,13 @@ script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-Wall -Wextra -pedantic' --with-boos
 after_script: cd ..\r
 \r
 # blacklist\r
-branches:\r
-  except:\r
-    - integration\r
+#branches:\r
+#  except:\r
+#    - integration\r
 \r
 # whitelist\r
 branches:\r
   only:\r
     - master\r
     - dev\r
+    - integration\r