Fix merge of .travis.yml

.travis.yml

@@ -5,111 +5,142 @@ cache:
 
 branches:
   except:
-    - /.*?pp?eyor.*/
-
+    - /.*pp.eyor.*/
 
 before_install:
   # we need a recent version of CMake
   # - sudo add-apt-repository -y ppa:andykimpe/cmake3
   # linux prereqisite packages
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzf cmake-3.2.3-Linux-x86_64.tar.gz -C ..; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/../cmake-3.2.3-Linux-x86_64/bin:$PATH; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi 
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y sloccount cppcheck; fi
-    
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-4.8; fi
 
 services:
   - mongodb
   - redis-server
-  - mysql
 
 notifications:
   slack: 
     rooms:
-      - pocoproject:4iwY1QpB8fdU2WqpcZ6PpZhz#travis
-      - kampbell:v4ARuptk0ETzwUsKDdV6Gspb#poco
+      - pocoproject:ItIUZvs8aJGyPdaKxIKMnS1t#travis
 
 env:
-  global: TEST_NAME=""
-
+  global: 
+    TEST_NAME=""
+    
 before_script:
  - echo ${TEST_NAME}
  - sqlite3 -version
+ - chmod 755 ./travis/Linux/runtests.sh
+ - chmod 755 ./travis/OSX/runtests.sh
 
 matrix:
   include:
     - env:    TEST_NAME="OSX   clang (make) bundled"
-      compiler: clang
       os: osx
+      compiler: clang
       script:
-        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -j2
-        - cat config.*
+        - export CC="clang"
+        - export CXX="clang++"
+        - clang++ -x c++ /dev/null -dM -E
+        - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite && make -s -j2
         - sudo make install
-        - ls -l /usr/local/lib/*Poco*
-        - find . -name "*testrunner*"
-        - ./travis/runtests.sh
+        - ./travis/OSX/runtests.sh
 
-    - env:    TEST_NAME="Linux gcc (make) bundled"
+    - env:    TEST_NAME="Linux gcc 4.6 (make) bundled"
       compiler: gcc
       script:
+        - export CC="gcc"
+        - export CXX="g++"
         - ./configure --everything && make -s -j2
-        - sudo make install
-        - ./travis/runtests.sh
+        - ./travis/Linux/runtests.sh
     
-    - env:    TEST_NAME="Linux gcc (make) unbundled"
+    - 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
+    
+    - env:    TEST_NAME="Linux gcc 4.6 (make) unbundled"
+      compiler: gcc
+      script:
+        - 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
+
+    - env:    TEST_NAME="Linux gcc 4.8 (make) unbundled"
       compiler: gcc
       script:
         - 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
-        - sudo make install
-        - ./travis/runtests.sh
+        - ./travis/Linux/runtests.sh
     
-    - env:    TEST_NAME="Linux clang (make)"
+    - env:    TEST_NAME="Linux clang 3.4 (make)"
       compiler: clang
       script:
         - ./configure --everything --config=Linux-clang && make -s -j2
-        - sudo make install
-        - ./travis/runtests.sh
+        - ./travis/Linux/runtests.sh
 
-    - env:    TEST_NAME="Linux arm-linux-gnueabi- (make)"
-      script:
-        - ./configure --omit=Data/ODBC,Data/MySQL,Crypto,NetSSL,PageCompiler && make -s -j2 CROSS_COMPILE=arm-linux-gnueabi- POCO_TARGET_OSARCH=armv7l
+    #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="Linux gcc (CMake)"
+    - env:    TEST_NAME="Linux gcc 4.6 (CMake)"
       compiler: gcc
       script:
-        # disable tests, gcc-4.6 gets an internal compiler error
-        - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=OFF .. && make -j2 && cd ..
+        - export CC="gcc"
+        - export CXX="g++"
+        - source ./travis/ignored.sh
+        - 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="gcc-4.8 (CMake)"
+    - env:    TEST_NAME="Linux gcc 4.8 (CMake)"
       compiler: gcc
       script:
-        - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        - sudo apt-get update -qq
-        - sudo apt-get install -qq -y g++-4.8
         - export CC="gcc-4.8"
         - export CXX="g++-4.8"
-        - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && cd ..
+        - source ./travis/ignored.sh
+        - 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="Linux clang (CMake)"
+    - env:    TEST_NAME="clang 3.4 (CMake)"
       compiler: clang
       script:
-        - mkdir cmake-build && cd cmake-build && cmake -DENABLE_TESTS=ON .. && make -j2 && cd ..
+        - source ./travis/ignored.sh
+        - 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="Linux arm-linux-gnueabi-g++ (CMake)"
       script:
         - export CC="arm-linux-gnueabi-gcc"
         - export CXX="arm-linux-gnueabi-g++"
-        - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -j2 && cd ..
+        - 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 ..
 
     - env:    TEST_NAME="Linux arm-linux-gnueabihf-g++ (CMake)"
       script:
         - export CC="arm-linux-gnueabihf-gcc"
         - export CXX="arm-linux-gnueabihf-g++"
-        - mkdir cmake-build && cd cmake-build && cmake -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_TESTS=OFF .. && make -j2 && cd ..
+        - 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 ..
 
     # TODO osx build
     # TODO run test suite
@@ -123,9 +154,11 @@ matrix:
 
     # QA jobs for code analytics and metrics
     # build documentation and release
-    - env:    TEST_NAME="documentation & release"
+    - env:    TEST_NAME="Linux documentation & release"
       compiler: gcc
       script:
+        - export CC="gcc"
+        - export CXX="g++"
         - . env.sh && mkdoc all && mkrel all
 
     # static code analysis with cppcheck (we can add --enable=all later)

Makefile

@@ -91,11 +91,13 @@ install: libexecs
 		fi ; \
 	done
 ifeq ($(OSNAME), Cygwin)
-	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f  {} $(INSTALLDIR)/bin \;
-	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*"    -type f -exec cp -f  {} $(INSTALLDIR)/bin \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*"    -type l -exec cp -Rf {} $(INSTALLDIR)/bin \;
 endif
-	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f  {} $(INSTALLDIR)/lib \;
-	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libCppUnit*" -type f -exec cp -f  {} $(INSTALLDIR)/lib \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libCppUnit*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*"    -type f -exec cp -f  {} $(INSTALLDIR)/lib \;
+	find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*"    -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
 
 libexecs =  Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec MongoDB-libexec Redis-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec
 tests    =  Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests MongoDB-tests Redis-tests Zip-tests CppParser-tests PDF-tests

Net/src/WebSocket.cpp

@@ -211,7 +211,7 @@ WebSocketImpl* WebSocket::completeHandshake(HTTPClientSession& cs, HTTPResponse&
 		throw WebSocketException("No Upgrade: websocket header in handshake response", WS_ERR_NO_HANDSHAKE);
 	std::string accept = response.get("Sec-WebSocket-Accept", "");
 	if (accept != computeAccept(key))
-		throw WebSocketException("Invalid or missing Sec-WebSocket-Accept header in handshake response", WS_ERR_NO_HANDSHAKE);
+		throw WebSocketException("Invalid or missing Sec-WebSocket-Accept header in handshake response", WS_ERR_HANDSHAKE_ACCEPT);
 	return new WebSocketImpl(static_cast<StreamSocketImpl*>(cs.detachSocket().impl()), true);
 }
 

travis/Linux/excluded.sh

@@ -0,0 +1,2 @@
+export EXCLUDE_TESTS="Data/MySQL Data/ODBC PDF"
+

travis/Linux/runtests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# set -ev
+set -v
+export POCO_BASE=`pwd`
+export PATH=$PATH:.
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.
+source ./travis/ignored.sh
+source ./travis/Linux/excluded.sh
+build/script/runtests.sh

travis/OSX/excluded.sh

@@ -0,0 +1,7 @@
+#
+# MongoDB & Redis does not work on Travis OSX
+# should be restored later on when the OSX environment would have
+# been fixed by Travis
+#
+export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB Redis PDF"
+

travis/OSX/runtests.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# set -ev
+set -v
+export POCO_BASE=`pwd`
+export PATH=$PATH:.
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.
+source ./travis/ignored.sh
+source ./travis/OSX/excluded.sh
+build/script/runtests.sh
+

travis/ignored.sh

@@ -1,6 +1,3 @@
-trap -p
-set -ev
-export POCO_BASE=`pwd`
 export CPPUNIT_IGNORE="\
   N7CppUnit10TestCallerI8PathTestEE.testExpand, \
   N7CppUnit10TestCallerI13RawSocketTestEE.testEchoIPv4, \
@@ -11,7 +8,3 @@ export CPPUNIT_IGNORE="\
   N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast, \
   N7CppUnit10TestCallerI13NTPClientTestEE.testTimeSync"
 
-export EXCLUDE_TESTS="Data/MySQL Data/ODBC PDF"
-export PATH=$PATH:.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.
-build/script/runtests.sh