This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new db12be7 PROTON-2298: Disable default running of c-threaderciser
tests, enable only through cmake option
db12be7 is described below
commit db12be7fe55a39e473c414f4bd38d6d45ff4a77a
Author: Kim van der Riet <k...@vanderriet.com>
AuthorDate: Wed Nov 11 17:28:55 2020 -0500
PROTON-2298: Disable default running of c-threaderciser tests, enable only
through cmake option
With changes from Robbie (mostly removals). This closes #277.
---
.github/workflows/build.yml | 2 +-
.travis.yml | 18 +++++++++---------
c/tests/CMakeLists.txt | 8 ++------
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3281a7..9fe50de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
cmake_generator: '-G "Visual Studio 16 2019"'
- os: macOS-latest
pkg_config_path: '/usr/local/opt/openssl@1.1/lib/pkgconfig'
- cmake_extra: '-DBUILD_RUBY=no'
+ cmake_extra: '-DBUILD_RUBY=no -DTHREADERCISER=ON'
env:
BuildType: ${{matrix.buildType}}
BuildDir: ${{github.workspace}}/BLD
diff --git a/.travis.yml b/.travis.yml
index 6693a2f..67688ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ jobs:
env:
- OPENSSL_ia32cap='0x00000000'
# c-threaderciser test hangs on older clang
- - QPID_PROTON_CMAKE_ARGS='-DENABLE_LINKTIME_OPTIMIZATION=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DENABLE_LINKTIME_OPTIMIZATION=OFF
-DTHREADERCISER=ON'
- QPID_PROTON_CTEST_ARGS='--exclude-regex c-threaderciser'
- name: static libs
os: linux
@@ -41,7 +41,7 @@ jobs:
compiler: gcc
env:
- PYTHON=python3
- - QPID_PROTON_CMAKE_ARGS='-DBUILD_STATIC_LIBS=ON'
+ - QPID_PROTON_CMAKE_ARGS='-DBUILD_STATIC_LIBS=ON -DTHREADERCISER=ON'
- name: benchmarks
os: linux
dist: focal
@@ -49,7 +49,7 @@ jobs:
compiler: gcc
env:
- PYTHON=python3
- - QPID_PROTON_CMAKE_ARGS='-DENABLE_BENCHMARKS=ON -DRUNTIME_CHECK=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DENABLE_BENCHMARKS=ON -DRUNTIME_CHECK=OFF
-DTHREADERCISER=ON'
before_install:
- sudo apt-get install -y libbenchmark-dev
- name: gcc asan
@@ -62,7 +62,7 @@ jobs:
- CXX=g++-10
- PYTHON=python3
# python-tox-test fails and ruby tests segfault
- - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF
-DTHREADERCISER=ON'
- QPID_PROTON_CTEST_ARGS='-E ^ruby.*'
- name: clang asan
os: linux
@@ -73,7 +73,7 @@ jobs:
- CC=clang-10
- CXX=clang++-10
- PYTHON=python3
- - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF
-DTHREADERCISER=ON'
# otherwise, on Travis ldd gives `libclang_rt.asan-x86_64.so => not found`
and binaries don't work
- LD_LIBRARY_PATH=/usr/lib/llvm-10/lib/clang/10.0.0/lib/linux/
- name: gcc tsan
@@ -86,7 +86,7 @@ jobs:
- CXX=g++-10
- PYTHON=python3
# python-test, python-integration-test, and python-tox-test segfault
- - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF'
+ - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF
-DTHREADERCISER=ON'
- QPID_PROTON_CTEST_ARGS="-E 'python-test|python-integration-test'"
- name: coverage
os: linux
@@ -94,7 +94,7 @@ jobs:
language: cpp
compiler: gcc
env:
- - QPID_PROTON_CMAKE_ARGS='-DCMAKE_BUILD_TYPE=Coverage'
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_BUILD_TYPE=Coverage -DTHREADERCISER=ON'
after_success:
- bash <(curl -s https://codecov.io/bash)
@@ -105,7 +105,7 @@ jobs:
env:
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- PKG_CONFIG_PATH='/usr/local/opt/openssl@1.1/lib/pkgconfig'
- - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
-DTHREADERCISER=ON'
# c-threaderciser test hangs on older clang
# python-tox-test segfaults and ruby tests do not start due to dynamic
library issues
- QPID_PROTON_CTEST_ARGS="--exclude-regex
'c-threaderciser|python-tox-test|ruby.*'"
@@ -117,7 +117,7 @@ jobs:
env:
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- PKG_CONFIG_PATH='/usr/local/opt/openssl@1.1/lib/pkgconfig'
- - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14'
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14
-DTHREADERCISER=ON'
# TODO PROTON-2225: c-threaderciser sometimes fails with assertion error
# python-tox-test segfaults and ruby tests do not start due to dynamic
library issues
- QPID_PROTON_CTEST_ARGS="--exclude-regex
'c-threaderciser|python-tox-test|ruby.*'"
diff --git a/c/tests/CMakeLists.txt b/c/tests/CMakeLists.txt
index 487c297..6db120f 100644
--- a/c/tests/CMakeLists.txt
+++ b/c/tests/CMakeLists.txt
@@ -83,12 +83,8 @@ if (CMAKE_CXX_COMPILER)
target_link_libraries(c-ssl-proactor-test qpid-proton-core
qpid-proton-proactor ${PLATFORM_LIBS})
# Thread race test.
- if (CMAKE_USE_PTHREADS_INIT OR CMAKE_HP_PTHREADS_INIT)
- # test requires pthreads
- set(DEFAULT_THREADERCISER ON)
- else (CMAKE_USE_PTHREADS_INIT OR CMAKE_HP_PTHREADS_INIT)
- set(DEFAULT_THREADERCISER OFF)
- endif (CMAKE_USE_PTHREADS_INIT OR CMAKE_HP_PTHREADS_INIT)
+ # Temporarily disable threaderciser tests by default. Re-enabled in CI
configs as appropriate.
+ set(DEFAULT_THREADERCISER OFF)
option(THREADERCISER "Run the threaderciser concurrency tests"
${DEFAULT_THREADERCISER})
if (THREADERCISER)
add_executable(c-threaderciser threaderciser.c)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
