diff --git a/.github/workflows/_reusable-test-native.yml b/.github/workflows/_reusable-test-native.yml index dd1b3fe8d..15786c44d 100644 --- a/.github/workflows/_reusable-test-native.yml +++ b/.github/workflows/_reusable-test-native.yml @@ -164,15 +164,12 @@ jobs: if: env.SKIP_JOB != 'true' continue-on-error: true env: - LABEL_REGEX: ${{ matrix.kind == 'coverage' && '^(ut)$' || '^(.*)$' }} + CTEST_SELECT: ${{ matrix.kind == 'coverage' && '--tests-regex "^(Ut|BtApi)"' || '--label-regex "^(.*)$"' }} run: | cd ${{ env.ROOT_PATH }} cd patomic/build - sudo apt install tree # debug - tree . - ctest --show-only=json-v1 - ctest --label-regex "${{ env.LABEL_REGEX }}" --verbose --output-junit Testing/Temporary/results.xml --build-config ${{ env.CMAKE_BUILD_TYPE }} . + ctest ${{ env.CTEST_SELECT }} --verbose --output-junit Testing/Temporary/results.xml --build-config ${{ env.CMAKE_BUILD_TYPE }} . - name: Prepare Test Results if: env.SKIP_JOB != 'true' diff --git a/.github/workflows/_reusable-test-qemu.yml b/.github/workflows/_reusable-test-qemu.yml index 0b48097fa..082f319d8 100644 --- a/.github/workflows/_reusable-test-qemu.yml +++ b/.github/workflows/_reusable-test-qemu.yml @@ -201,12 +201,12 @@ jobs: if: env.SKIP_JOB != 'true' continue-on-error: true env: - LABEL_REGEX: ${{ matrix.kind == 'coverage' && '^(ut)$' || '^(.*)$' }} + CTEST_SELECT: ${{ matrix.kind == 'coverage' && '--tests-regex "^(Ut|BtApi)"' || '--label-regex "^(.*)$"' }} run: | cd ${{ env.ROOT_PATH }} cd patomic/build - ctest --label-regex "${{ env.LABEL_REGEX }}" --verbose --output-junit Testing/Temporary/results.xml . + ctest ${{ env.CTEST_SELECT }} --verbose --output-junit Testing/Temporary/results.xml . - name: Prepare Test Results if: env.SKIP_JOB != 'true' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 57f3315ba..104b86925 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,7 +55,6 @@ jobs: architecture: ${{ matrix.architecture }} test-qemu: - if: false # debug strategy: matrix: # architecture gets converted to triple