diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index edc2f938..1f73be14 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,38 +5,40 @@ on: - 'docs/**' jobs: - linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: make test - run: make test + # linux: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v1 + # - name: make test + # run: make test - mac: + mac_openssl_tsan: runs-on: macOS-latest steps: - uses: actions/checkout@v1 + - name: install openssl + run: brew install openssl - name: make test - run: make test + run: make test_tsan_openssl - tsan: - runs-on: macOS-latest - steps: - - uses: actions/checkout@v1 - - name: make test_tsan - run: make test_tsan + # tsan: + # runs-on: macOS-latest + # steps: + # - uses: actions/checkout@v1 + # - name: make test_tsan + # run: make test_tsan - win: - runs-on: windows-latest - steps: - - uses: actions/checkout@v1 - - uses: seanmiddleditch/gha-setup-vsdevenv@master - - run: | - mkdir build - cd build - cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 .. - - run: cmake --build build + # win: + # runs-on: windows-latest + # steps: + # - uses: actions/checkout@v1 + # - uses: seanmiddleditch/gha-setup-vsdevenv@master + # - run: | + # mkdir build + # cd build + # cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 .. + # - run: cmake --build build - # Running the unittest does not work - #- run: ../build/test/ixwebsocket_unittest.exe - # working-directory: test + # # Running the unittest does not work + # #- run: ../build/test/ixwebsocket_unittest.exe + # # working-directory: test diff --git a/makefile b/makefile index 44c4fc77..9e21dfa3 100644 --- a/makefile +++ b/makefile @@ -105,6 +105,11 @@ test_asan: (cd build/test ; ln -sf Debug/ixwebsocket_unittest) (cd test ; python2.7 run.py -r) +test_tsan_openssl: + mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=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)