From 7e149e65b874a2e24accf667edf27fff98e92c13 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Fri, 28 Jun 2024 13:32:35 +0000 Subject: [PATCH 1/2] Run unit tests concurrently in CI --- .github/workflows/build.yml | 15 ++++++--------- cmake/common.cmake | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bfb71ec18ab..1c396d8f2976 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,15 +69,12 @@ jobs: rm -rf /github/home/.cache mkdir -p /github/home/.cache export ASAN_SYMBOLIZER_PATH=$(realpath /usr/bin/llvm-symbolizer-15) - ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|perf|protocolstest|vegeta|suite" - shell: bash - if: "${{ matrix.platform.name != 'snp' }}" # Needs 1ES Pool support - - - name: "Partitions Test ${{ matrix.platform.name }}" - run: | - set -ex - cd build - source env/bin/activate && ctest -VV --timeout 240 -L partitions -C partitions + # Unit tests + ./tests.sh --output-on-failure -L unit -j16 + # All other acceptably fast tests, mostly end-to-end + ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|perf|protocolstest|vegeta|suite|unit" + # Partitions tests + ./tests.sh --timeout 240 --output-on-failure -L partitions -C partitions shell: bash if: "${{ matrix.platform.name != 'snp' }}" # Needs 1ES Pool support diff --git a/cmake/common.cmake b/cmake/common.cmake index eebb8bb66933..c2f98c0cb74c 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -17,7 +17,7 @@ function(add_unit_test name) set_property( TEST ${name} APPEND - PROPERTY LABELS unit_test + PROPERTY LABELS unit ) set_property( From 709805fce2c79d62e732cabe444a8293f1fe39ff Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Fri, 28 Jun 2024 15:44:33 +0100 Subject: [PATCH 2/2] Update .github/workflows/build.yml Co-authored-by: Eddy Ashton --- .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 1c396d8f2976..ae4139e23085 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: mkdir -p /github/home/.cache export ASAN_SYMBOLIZER_PATH=$(realpath /usr/bin/llvm-symbolizer-15) # Unit tests - ./tests.sh --output-on-failure -L unit -j16 + ./tests.sh --output-on-failure -L unit -j$(nproc --all) # All other acceptably fast tests, mostly end-to-end ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|perf|protocolstest|vegeta|suite|unit" # Partitions tests