Update travis CI (#49)

Author: an-tao

.travis.yml

@@ -1,13 +1,12 @@
-os:
-  - linux
-  - osx
-
-osx_image: xcode10.1
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+    - os: osx
+      osx_image: xcode11
 
 sudo: required
 
-dist: xenial
-
 language: cpp
 
 addons:
@@ -20,13 +19,14 @@ addons:
     - libssl-dev
     - build-essential
     - cmake
+    - libgtest-dev
+    - libc-ares-dev
   homebrew:
     packages:
     - openssl
     - cmake
     - libtool
+    - gtest
 
 script:
-  - ./build.sh
-
-
+  - ./build.sh -t

CMakeLists.txt

@@ -84,15 +84,15 @@ set_property(TARGET trantor PROPERTY CXX_STANDARD 14)
 set_property(TARGET trantor PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET trantor PROPERTY CXX_EXTENSIONS OFF)
 
-if (MAKETEST STREQUAL YES)
+if(MAKETEST STREQUAL YES)
     add_subdirectory(trantor/tests)
     find_package(GTest)
     if(GTest_FOUND)
         include_directories(${GTEST_INCLUDE_DIRS})
         link_libraries(${GTEST_LIBRARIES})
         add_subdirectory(trantor/unittests)
     endif()
-endif ()
+endif()
 
 set(public_net_headers
     trantor/net/EventLoop.h

build.sh

@@ -20,8 +20,12 @@ function build_trantor() {
     echo "Entering folder: ${build_dir}"
     cd $build_dir
 
-    echo "Start building drogon ..."
-    cmake ..
+    echo "Start building trantor ..."
+    if [ $1 -eq 1 ]; then
+        cmake .. -DMAKETEST=YES
+    else
+        cmake ..
+    fi
 
     #If errors then exit
     if [ "$?" != "0" ]; then
@@ -44,4 +48,8 @@ function build_trantor() {
     #Ok!
 }
 
-build_trantor
+if [ "$1" = "-t" ]; then
+    build_trantor 1
+else
+    build_trantor 0
+fi

trantor/utils/MsgBuffer.cc

@@ -87,7 +87,7 @@ void MsgBuffer::ensureWritableBytes(size_t len)
     newbuffer.append(*this);
     swap(newbuffer);
 }
-void MsgBuffer::swap(MsgBuffer &buf)
+void MsgBuffer::swap(MsgBuffer &buf) noexcept
 {
     _buffer.swap(buf._buffer);
     std::swap(_head, buf._head);

trantor/utils/MsgBuffer.h

@@ -65,7 +65,7 @@ class MsgBuffer
     uint16_t readInt16();
     uint32_t readInt32();
     uint64_t readInt64();
-    void swap(MsgBuffer &buf);
+    void swap(MsgBuffer &buf) noexcept;
     size_t readableBytes() const
     {
         return _tail - _head;
@@ -167,4 +167,19 @@ class MsgBuffer
         return &_buffer[0];
     }
 };
+
+inline void swap(MsgBuffer &one, MsgBuffer &two) noexcept
+{
+    one.swap(two);
+}
 }  // namespace trantor
+
+namespace std
+{
+template <>
+inline void swap<trantor::MsgBuffer>(trantor::MsgBuffer &one,
+                                     trantor::MsgBuffer &two) noexcept
+{
+    one.swap(two);
+}
+}  // namespace std