From 18164c0c3828768f4d4a49d5a70b876015ffbfa9 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Thu, 26 Mar 2020 19:16:04 -0700 Subject: [PATCH] New CI builder: Mac + MbedTLS + Thread Sanitizer --- .github/workflows/ccpp.yml | 9 +++++++++ makefile | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 8b02fbac..204af21c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -28,6 +28,15 @@ jobs: - name: make test run: make test_tsan_openssl + mac_tsan_mbedtls: + runs-on: macOS-latest + steps: + - uses: actions/checkout@v1 + - name: install mbedtls + run: brew install mbedtls + - name: make test + run: make test_tsan_mbedtls + win: runs-on: windows-latest steps: diff --git a/makefile b/makefile index 9e21dfa3..a0be8e76 100644 --- a/makefile +++ b/makefile @@ -110,6 +110,11 @@ test_tsan_openssl: (cd build/test ; ln -sf Debug/ixwebsocket_unittest) (cd test ; python2.7 run.py -r) +test_tsan_mbedtls: + mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_MBED_TLS=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES) + (cd build/test ; ln -sf Debug/ixwebsocket_unittest) + (cd test ; python2.7 run.py -r) + test_openssl: mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_OPEN_SSL=1 -DUSE_TEST=1 .. ; make -j 4) (cd test ; python2.7 run.py -r)