diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 5b12a815..a5f4080d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -181,7 +181,7 @@ jobs: export PATH=../deps/nats-server:../deps/nats-streaming-server:$PATH export NATS_TEST_SERVER_VERSION="$(nats-server -v)" flags="" - ctest -R 'MicroAddService' --timeout 60 --output-on-failure --repeat-until-fail 100 + ctest -R 'Micro' --timeout 60 --output-on-failure --repeat-until-fail 100 # ctest -L 'test' --timeout 60 --output-on-failure --repeat-until-fail ${{ inputs.repeat }} - name: Upload coverage reports to Codecov diff --git a/.github/workflows/on-pr-debug.yml b/.github/workflows/on-pr-debug.yml index 43c10529..5bbf7f39 100644 --- a/.github/workflows/on-pr-debug.yml +++ b/.github/workflows/on-pr-debug.yml @@ -6,27 +6,27 @@ permissions: contents: write # so it can comment jobs: - # Ubuntu: - # name: "Ubuntu" - # strategy: - # fail-fast: false - # matrix: - # compiler: [gcc, clang] - # uses: ./.github/workflows/build-test.yml - # with: - # compiler: ${{ matrix.compiler }} - # server_version: main - # type: Debug + Ubuntu: + name: "Ubuntu" + strategy: + fail-fast: false + matrix: + compiler: [gcc, clang] + uses: ./.github/workflows/build-test.yml + with: + compiler: ${{ matrix.compiler }} + server_version: main + type: Debug - # dev-mode: - # name: "DEV_MODE" - # uses: ./.github/workflows/build-test.yml - # with: - # dev_mode: ON - # server_version: main - # type: Debug - # verbose_test_output: ON - # verbose_make_output: ON + dev-mode: + name: "DEV_MODE" + uses: ./.github/workflows/build-test.yml + with: + dev_mode: ON + server_version: main + type: Debug + verbose_test_output: ON + verbose_make_output: ON sanitize: name: "Sanitize" @@ -44,25 +44,25 @@ jobs: sanitize: ${{ matrix.sanitize }} pool_dispatch: ${{ matrix.pooled_dispatch }} - # coverage-TLS: - # name: "Coverage: TLS" - # strategy: - # fail-fast: false - # matrix: - # pooled_dispatch: [pool, NO-pool] - # write_deadline: [write_deadline, NO-write_deadline] - # uses: ./.github/workflows/build-test.yml - # with: - # coverage: ON - # type: RelWithDebInfo - # server_version: main - # compiler: gcc - # tls: TLS - # verify_host: verify_host - # pool_dispatch: ${{ matrix.pooled_dispatch }} - # write_deadline: ${{ matrix.write_deadline }} - # secrets: - # CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + coverage-TLS: + name: "Coverage: TLS" + strategy: + fail-fast: false + matrix: + pooled_dispatch: [pool, NO-pool] + write_deadline: [write_deadline, NO-write_deadline] + uses: ./.github/workflows/build-test.yml + with: + coverage: ON + type: RelWithDebInfo + server_version: main + compiler: gcc + tls: TLS + verify_host: verify_host + pool_dispatch: ${{ matrix.pooled_dispatch }} + write_deadline: ${{ matrix.write_deadline }} + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} # coverage-NO-verify_host: # name: "Coverage: NO-verify_host" diff --git a/.github/workflows/on-push-release.yml b/.github/workflows/on-push-release.yml index d7ebdd84..0c1b570e 100644 --- a/.github/workflows/on-push-release.yml +++ b/.github/workflows/on-push-release.yml @@ -1,25 +1,25 @@ -# name: "Release" -# on: -# push: +name: "Release" +on: + push: -# permissions: -# contents: write # required by build-test to comment on coverage but not used here. +permissions: + contents: write # required by build-test to comment on coverage but not used here. -# defaults: -# run: -# shell: bash --noprofile --norc -x -eo pipefail {0} +defaults: + run: + shell: bash --noprofile --norc -x -eo pipefail {0} -# jobs: - # quick: - # name: "Ubuntu" - # strategy: - # fail-fast: false - # matrix: - # compiler: [gcc, clang] - # ubuntu_version: [latest, 20.04] - # uses: ./.github/workflows/build-test.yml - # with: - # server_version: main - # ubuntu_version: ${{ matrix.ubuntu_version }} - # compiler: ${{ matrix.compiler }} - # type: RelWithDebInfo +jobs: + quick: + name: "Ubuntu" + strategy: + fail-fast: false + matrix: + compiler: [gcc, clang] + ubuntu_version: [latest, 20.04] + uses: ./.github/workflows/build-test.yml + with: + server_version: main + ubuntu_version: ${{ matrix.ubuntu_version }} + compiler: ${{ matrix.compiler }} + type: RelWithDebInfo diff --git a/test/test.c b/test/test.c index 09a19c74..785910d5 100644 --- a/test/test.c +++ b/test/test.c @@ -33593,7 +33593,7 @@ _startManyMicroservices(microService** svcs, int n, natsConnection *nc, microSer #define _waitForMicroservicesAllDone(_arg) \ { \ - nats_Sleep(valgrind ? 500 : 20); \ + nats_Sleep(valgrind ? 20 : 10); \ natsMutex_Lock((_arg)->m); \ testf("Wait for %d microservices to stop: ", (_arg)->microRunningServiceCount); \ natsStatus waitStatus = NATS_OK; \ @@ -33844,8 +33844,13 @@ void test_MicroAddService(void) } microServiceInfo_Destroy(info); + + int64_t start = nats_Now(); + int64_t nn; _destroyMicroservice(m); + printf("<>/<> destroy time: %lld\n", (nn = nats_Now()) - start); _waitForMicroservicesAllDone(&arg); + printf("<>/<> waited for: %lld\n", nats_Now() - nn); } test("Destroy the test connection: ");