diff --git a/.travis.yml b/.travis.yml index 4d8d28c..ef897bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -166,8 +166,18 @@ script: -DBUILD_TESTING=on -DWERROR=on -G "${GENERATOR}" .. - - ${SCAN_BUILD} cmake --build . --config ${BUILD_TYPE} --target install - - CYCLONEDDS_URI='all' ctest -T test -C ${BUILD_TYPE} + - case "${GENERATOR}" in + "Unix Makefiles") + ${SCAN_BUILD} cmake --build . --config ${BUILD_TYPE} --target install -- -j 4 + ;; + "Visual Studio "*) + ${SCAN_BUILD} cmake --build . --config ${BUILD_TYPE} --target install -- -nologo -verbosity:minimal -maxcpucount -p:CL_MPCount=2 + ;; + *) + ${SCAN_BUILD} cmake --build . --config ${BUILD_TYPE} --target install + ;; + esac + - CYCLONEDDS_URI='all' ctest -j 4 --output-on-failure -T test -C ${BUILD_TYPE} - if [ "${ASAN}" != "none" ]; then CMAKE_LINKER_FLAGS="-DCMAKE_LINKER_FLAGS=-fsanitize=${USE_SANITIZER}"; CMAKE_C_FLAGS="-DCMAKE_C_FLAGS=-fsanitize=${USE_SANITIZER}"; diff --git a/appveyor.yml b/appveyor.yml index 9e07208..e05dec9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,14 +37,14 @@ build_script: - cd build - conan install -s arch=%ARCH% -s build_type=%CONFIGURATION% .. - cmake -DBUILD_TESTING=on -DWERROR=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_INSTALL_PREFIX=%CD%/install -G "%GENERATOR%" .. - - cmake --build . --config %CONFIGURATION% --target install -- /maxcpucount + - cmake --build . --config %CONFIGURATION% --target install -- /nologo /verbosity:minimal /maxcpucount /p:CL_MPCount=2 - cd install/share/CycloneDDS/examples/helloworld - mkdir build - cd build - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%GENERATOR%" .. - - cmake --build . --config %CONFIGURATION% -- /maxcpucount + - cmake --build . --config %CONFIGURATION% -- /nologo /verbosity:minimal /maxcpucount /p:CL_MPCount=2 - cd ../../../../../.. test_script: - set "CYCLONEDDS_URI=all" - - ctest --test-action test --build-config %CONFIGURATION% + - ctest --output-on-failure --parallel 4 --test-action test --build-config %CONFIGURATION%