From 0645fa79a29f0b52e5e2395b5a51560822500673 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 12:09:49 +0100 Subject: [PATCH 1/4] Add fast fail. Restore arm-linux-gnueabi-g++. Signed-off-by: FrancisANDRE --- .travis.yml | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06d21f48f..1f6dfd804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,8 @@ before_script: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi matrix: + fast_finish: true + include: - env: TEST_NAME="OSX clang (make) bundled" os: osx @@ -53,25 +55,21 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 - - sudo make install - - ./travis/OSX/runtests.sh + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -79,8 +77,7 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -88,19 +85,17 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && make -s -j2 - - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && make -s -j2 install && - ./travis/Linux/runtests.sh #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - #FIXME - env: TEST_NAME="arm-linux-gnueabi- (make)" - #FIXME script: - #FIXME - ./configure --omit=Data/ODBC,Data/MySQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - env: TEST_NAME="arm-linux-gnueabi- (make)" + script: + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -134,7 +129,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 && cd .. + - make -s -j2 install && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -143,17 +138,8 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 && cd .. + - make -s -j2 install && cd .. - # TODO osx build - # TODO run test suite - # script: - # - ./configure && make -s -i -j2 - # - sudo ifconfig -a - # - sudo ifconfig venet0 multicast - # - sudo ifconfig -a - # - export POCO_BASE=`pwd` - # - sudo -E build/script/runtests.sh # QA jobs for code analytics and metrics # build documentation and release From 3efe787a6415175b16af899f7ebf4386ecafad7e Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 14:25:23 +0100 Subject: [PATCH 2/4] Use sudo for installing Poco libs. Signed-off-by: FrancisANDRE --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f6dfd804..d1057f79e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,14 +62,14 @@ matrix: script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -77,7 +77,7 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -85,17 +85,17 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && make -s -j2 install && - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && sudo make -s -j2 install && - ./travis/Linux/runtests.sh #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - env: TEST_NAME="arm-linux-gnueabi- (make)" script: - - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && sudo make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -128,8 +128,8 @@ matrix: - export CXX="arm-linux-gnueabi-g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 install && cd .. + - mkdir cmake-build + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -137,8 +137,8 @@ matrix: - export CXX="arm-linux-gnueabihf-g++" - source ./travis/ignored.sh - export POCO_BASE=`pwd` - - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. - - make -s -j2 install && cd .. + - mkdir cmake-build + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. # QA jobs for code analytics and metrics From ff32e89a278f8e99e0fc651e8825a8a121bb00a9 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 14:50:05 +0100 Subject: [PATCH 3/4] Restore travis/script/runtests Signed-off-by: FrancisANDRE --- .travis.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1057f79e..c57356e7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,8 @@ before_script: - chmod 755 ./travis/Linux/runtests.sh - chmod 755 ./travis/OSX/runtests.sh - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql -u root -e 'create database pocotestdb;'; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then mysql --version; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then postgres --version; fi matrix: fast_finish: true @@ -55,21 +57,24 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install && ./travis/OSX/runtests.sh + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 && sudo make install + - ./travis/OSX/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) bundled" compiler: gcc script: - export CC="gcc" - export CXX="g++" - - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) bundled" compiler: gcc script: - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.6 (make) unbundled" compiler: gcc @@ -77,7 +82,8 @@ matrix: - export CC="gcc" - export CXX="g++" - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux gcc 4.8 (make) unbundled" compiler: gcc @@ -85,17 +91,19 @@ matrix: - sudo apt-get install -qq -y libpcre3-dev libssl-dev libexpat1-dev - export CC="gcc-4.8" - export CXX="g++-4.8" - - ./configure --everything --unbundled && sudo make -s -j2 install && ./travis/Linux/runtests.sh + - ./configure --everything --unbundled && make -s -j2 + - ./travis/Linux/runtests.sh - env: TEST_NAME="Linux clang 3.4 (make)" compiler: clang script: - - ./configure --everything --config=Linux-clang && sudo make -s -j2 install && - ./travis/Linux/runtests.sh + - ./configure --everything --config=Linux-clang && make -s -j2 + - ./travis/Linux/runtests.sh - #FIXME the -m64 option bring by the Linux config is not supported by arm-linux-gnueabi-g++ which makes this test failing - - env: TEST_NAME="arm-linux-gnueabi- (make)" + - env: TEST_NAME="Linux arm-linux-gnueabi- (make)" + compiler: gcc script: - - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && sudo make -s -j2 install CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l + - ./configure --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l - env: TEST_NAME="Linux gcc 4.6 (CMake)" compiler: gcc @@ -115,7 +123,7 @@ matrix: - export POCO_BASE=`pwd` - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - - env: TEST_NAME="clang 3.4 (CMake)" + - env: TEST_NAME="Linux clang 3.4 (CMake)" compiler: clang script: - source ./travis/ignored.sh @@ -129,7 +137,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" script: @@ -138,7 +146,7 @@ matrix: - source ./travis/ignored.sh - export POCO_BASE=`pwd` - mkdir cmake-build - - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && sudo make -s -j2 install && cd .. + - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. # QA jobs for code analytics and metrics From 57bc0cc4cf5f34159cdc3b7ef4231cb6ef4913c5 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 11 Mar 2016 15:34:12 +0100 Subject: [PATCH 4/4] Display postgres and mysql version. Signed-off-by: FrancisANDRE --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c57356e7b..21752b173 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,7 @@ matrix: - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -s -j2 && ctest -VV -E Data && cd .. - env: TEST_NAME="Linux arm-linux-gnueabi-g++ (CMake)" + compiler: gcc script: - export CC="arm-linux-gnueabi-gcc" - export CXX="arm-linux-gnueabi-g++" @@ -140,6 +141,7 @@ matrix: - cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=ON .. && make -s -j2 && cd .. - env: TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)" + compiler: gcc script: - export CC="arm-linux-gnueabihf-gcc" - export CXX="arm-linux-gnueabihf-g++"