saberbud/tbb
1
0
Fork 0
mirror of https://github.com/wjakob/tbb.git synced 2026-08-29 16:40:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

ability to disable certain tests on AppVeyor/Travis CI

Browse Source
This commit is contained in:
Wenzel Jakob
2017-08-24 11:21:57 +02:00
parent 2a483deb85
commit c28c8bec52
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.appveyor.yml
+1 -1
View File
@@ -17,7 +17,7 @@ install:
build_script:
- echo Running cmake...
- cd c:\projects\tbb
- cmake -G "%CMAKE_PLATFORM%" -DCMAKE_SUPPRESS_REGENERATION=1
- cmake -G "%CMAKE_PLATFORM%" -DCMAKE_SUPPRESS_REGENERATION=1 -DTBB_CI_BUILD=ON
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- cmake --build . --config %Configuration% -- /v:m /logger:%MSBuildLogger%
- ctest -C %Configuration% --output-on-failure --timeout 500
.travis.yml
+4 -4
View File
@@ -7,7 +7,7 @@ matrix:
- os: linux
compiler: gcc-4.8
script:
- CXXFLAGS="-mno-rtm" cmake -DCMAKE_CXX_COMPILER=g++-4.8 .
- CXXFLAGS="-mno-rtm" cmake -DCMAKE_CXX_COMPILER=g++-4.8 -DTBB_CI_BUILD=ON .
- make -j2
- ctest -j2 --output-on-failure --timeout 500
addons:
@@ -20,13 +20,13 @@ matrix:
- os: osx
compiler: clang
script:
- cmake .
- cmake -DTBB_CI_BUILD=ON .
- make -j2
- ctest -j2 --output-on-failure --timeout 500
- os: linux
compiler: x86_64-w64-mingw32-g++
script:
- cmake -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=x86_64-w64-mingw32 .
- cmake -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=x86_64-w64-mingw32 -DTBB_CI_BUILD=ON .
- make -j2
addons:
apt:
@@ -38,7 +38,7 @@ matrix:
- os: linux
compiler: i686-w64-mingw32-g++
script:
- cmake -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=i686-w64-mingw32 .
- cmake -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DCMAKE_TOOLCHAIN_FILE=build/mingw_cross_toolchain.cmake -DGNU_HOST=i686-w64-mingw32 -DTBB_CI_BUILD=ON .
- make -j2
addons:
apt:
CMakeLists.txt
+3 -1
View File
@@ -35,6 +35,7 @@ option(TBB_BUILD_STATIC "Build TBB static library" ON)
option(TBB_BUILD_TBBMALLOC "Build TBB malloc library" ON)
option(TBB_BUILD_TBBMALLOC_PROXY "Build TBB malloc proxy library" ON)
option(TBB_BUILD_TESTS "Build TBB tests and enable testing infrastructure" ON)
option(TBB_CI_BUILD "Is this a continuous integration build?" OFF)
if(APPLE)
set(CMAKE_MACOSX_RPATH ON)
@@ -469,7 +470,8 @@ if (TBB_BUILD_TESTS)
endif ()
tbb_add_test (overwrite_node)
# tbb_add_test (parallel_do)
if (NOT WIN32)
if (NOT TBB_CI_BUILD)
# This seems to fail on CI platforms (AppVeyor/Travis), perhaps because the VM exposes just 1 core?
tbb_add_test (parallel_for)
endif()
tbb_add_test (parallel_for_each)