From 2b6a24443f0b6768df2aeeb5461b3d04e5dd76a1 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 4 Mar 2021 16:14:37 +0100 Subject: [PATCH 1/5] try to run epoll and libuv --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2d8e743ed..36aad29cb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,13 +11,16 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] buildType: [RelWithDebInfo] include: + - os: ubuntu-latest + cmake_extra: '-DPROACTOR=epoll' + - os: ubuntu-latest + cmake_extra: '-DPROACTOR=libuv' - os: windows-latest cmake_extra: '-A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake' 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 -DTHREADERCISER=ON' - ctest_extra: '--exclude-regex c-threaderciser' env: BuildType: ${{matrix.buildType}} BuildDir: ${{github.workspace}}/BLD From 4e265bc66e678d0e502c22072549c107fcb6d5dd Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 4 Mar 2021 16:18:29 +0100 Subject: [PATCH 2/5] try to run epoll and libuv --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36aad29cb7..eca18d3a56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: - name: Install Linux dependencies if: runner.os == 'Linux' run: | - sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev + sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libuv-dev - name: Install Windows dependencies if: runner.os == 'Windows' run: | From 78949dd3acc093e31f1a88400df42965c6364cf1 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 4 Mar 2021 16:19:33 +0100 Subject: [PATCH 3/5] try to run epoll and libuv --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eca18d3a56..7c9e9cdc59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: - name: Install Linux dependencies if: runner.os == 'Linux' run: | - sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libuv-dev + sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libuv1-dev - name: Install Windows dependencies if: runner.os == 'Windows' run: | From d433890ade93057bce98c2a21664eee527315c05 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 4 Mar 2021 16:35:42 +0100 Subject: [PATCH 4/5] try to run epoll and libuv --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c9e9cdc59..b926ca8ac0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,10 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] buildType: [RelWithDebInfo] + proactor: [default] include: - os: ubuntu-latest - cmake_extra: '-DPROACTOR=epoll' - - os: ubuntu-latest + proactor: libuv cmake_extra: '-DPROACTOR=libuv' - os: windows-latest cmake_extra: '-A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake' From 73fe6be7f7624c61d0948aaf2be81ac4896c1f97 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 4 Mar 2021 16:41:21 +0100 Subject: [PATCH 5/5] asan and tsan --- .travis.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f20dfa3b7..a9cdd61f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ jobs: # python-tox-test fails and ruby tests segfault - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' - QPID_PROTON_CTEST_ARGS='-E ^ruby.*' - - name: clang asan + - name: libuv clang asan os: linux dist: focal before_install: @@ -73,7 +73,7 @@ jobs: - CC=clang-11 - CXX=clang++-11 - PYTHON=python3 - - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' + - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -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-11/lib/clang/11.0.0/lib/linux/ - name: gcc tsan @@ -88,6 +88,18 @@ jobs: # python-test, python-integration-test, and python-tox-test segfault - QPID_PROTON_CMAKE_ARGS='-DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' - QPID_PROTON_CTEST_ARGS="-E 'python-test|python-integration-test'" + - name: gcc tsan libuv + os: linux + dist: focal + before_install: + - sudo apt-get install -y gcc-10 g++-10 + env: + - CC=gcc-10 + - CXX=g++-10 + - PYTHON=python3 + # python-test, python-integration-test, and python-tox-test segfault + - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DRUNTIME_CHECK=tsan -DENABLE_TOX_TEST=OFF -DTHREADERCISER=ON' + - QPID_PROTON_CTEST_ARGS="-E 'python-test|python-integration-test'" - name: coverage os: linux dist: bionic @@ -127,6 +139,7 @@ addons: apt: packages: - cmake + - libuv1-dev - libssl-dev - libsasl2-dev - sasl2-bin