fix tests ci

Author: IronsDu

.travis.yml

@@ -8,62 +8,61 @@ common_sources: &all_sources
 matrix:
   include:
     - os: linux
-      compiler: gcc
       addons:
         apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-4.8']
-      env: COMPILER='g++-4.8'
+      env: 
+        - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
 
     - os: linux
-      compiler: gcc
       addons:
         apt:
           sources: *all_sources
           packages: ['g++-4.9']
-      env: COMPILER='g++-4.9'
+      env: 
+        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
 
     - os: linux
-      compiler: gcc
       addons:
         apt:
           sources: *all_sources
           packages: ['g++-5']
-      env: COMPILER='g++-5'
+      env: 
+        - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
 
     - os: linux
-      compiler: gcc
       addons: &gcc6
         apt:
           sources: *all_sources
           packages: ['g++-6']
-      env: COMPILER='g++-6'
+      env: 
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
 
     - os: linux
-      compiler: gcc
       addons: &gcc7
         apt:
           sources: *all_sources
           packages: ['g++-7']
-      env: COMPILER='g++-7'
+      env: 
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 
     - os: linux
-      compiler: gcc
       addons: *gcc6
-      env: COMPILER='g++-6' CPP14=1
+      env: 
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6 CPP14=1"
 
     - os: linux
-      compiler: gcc
       addons: *gcc7
-      env: COMPILER='g++-7' CPP14=1
-
-install:
-  - cmake . -Dbrynet_BUILD_EXAMPLES=ON -Dbrynet_BUILD_TESTS=ON
+      env: 
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 CPP14=1"
 
 before_script:
-  - export CXX=${COMPILER}
-
+   - eval "${MATRIX_EVAL}"
+   - env
+   - export CC_FOR_BUILD=$CC
+   - export CXX_FOR_BUILD=$CXX
 script:
+  - cmake . -Dbrynet_BUILD_EXAMPLES=ON -Dbrynet_BUILD_TESTS=ON
   - make
-  - cd tests
-  - ctest -V
+  - cd tests && ctest -V

CMakeLists.txt

@@ -68,12 +68,10 @@ endif(brynet_BUILD_EXAMPLES)
 
 if (brynet_BUILD_TESTS)
   if(WIN32)
-    if (MSVC_VERSION VERSION_GREATER 1910)
+    if (MSVC_VERSION VERSION_GREATER 1900)
       add_subdirectory(tests)
     endif() 
   elseif(UNIX)
-    if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) 
-      add_subdirectory(tests)
-    endif() 
+    add_subdirectory(tests)
   endif() 
 endif(brynet_BUILD_TESTS)

tests/test_wait_group.cpp

@@ -12,7 +12,7 @@ TEST_CASE("WaitGroup are computed", "[waitgroup]") {
 
     wg->add(2);
 
-    std::atomic<int> upvalue = 0;
+    std::atomic<int> upvalue = ATOMIC_VAR_INIT(1);
     auto a = std::thread([&]() {
         upvalue++;
         wg->done();