From: Nikola Pajkovsky Date: Wed, 7 Jan 2026 11:13:46 +0000 (+0100) Subject: lhash_test: set back num_workers to 16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277634a842bae99758683c3bfee8e250b17a26ff;p=thirdparty%2Fopenssl.git lhash_test: set back num_workers to 16 commit 131c2a1adba1 ("Defang the lhash test") has reduced default number of the thread workers in CI to HARNESS_JOBS / 4. Setting LHASH_WORKERS will set it back. Resolves: https://github.com/openssl/project/issues/1769 Signed-off-by: Nikola Pajkovsky Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale Reviewed-by: Saša Nedvědický MergeDate: Mon Jan 12 10:09:54 2026 (Merged from https://github.com/openssl/openssl/pull/29565) --- diff --git a/.github/workflows/make-test b/.github/workflows/make-test index 239fcfb4ae4..c38d0de3439 100755 --- a/.github/workflows/make-test +++ b/.github/workflows/make-test @@ -19,7 +19,7 @@ export OSSL_CI_ARTIFACTS_PATH="$(cd "$OSSL_CI_ARTIFACTS_PATH"; pwd)" # Run the tests. This might fail, but we need to capture artifacts anyway. set +e -make test HARNESS_JOBS=${HARNESS_JOBS:-4} "$@" +make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} "$@" RESULT=$? set -e diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml index ae314f941c6..4e23de862fb 100644 --- a/.github/workflows/os-zoo.yml +++ b/.github/workflows/os-zoo.yml @@ -52,7 +52,7 @@ jobs: cat /proc/cpuinfo ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} linux: if: github.repository == 'openssl/openssl' @@ -104,7 +104,7 @@ jobs: cat /proc/cpuinfo ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} macos: if: github.repository == 'openssl/openssl' @@ -130,7 +130,7 @@ jobs: sysctl machdep.cpu ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} windows: if: github.repository == 'openssl/openssl' @@ -183,7 +183,7 @@ jobs: shell: cmd run: | call "${{ matrix.platform.vcvars }}" - nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4 + nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4 LHASH_WORKERS=16 linux-arm64: runs-on: ubuntu-24.04-arm @@ -200,7 +200,7 @@ jobs: - name: get cpu info run: ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} linux-x86: runs-on: ubuntu-latest @@ -261,7 +261,7 @@ jobs: cat /proc/cpuinfo ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} linux-s390x: runs-on: linux-s390x @@ -281,7 +281,7 @@ jobs: cat /proc/cpuinfo ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} linux-riscv64: runs-on: linux-riscv64 @@ -301,7 +301,7 @@ jobs: - name: make test env: OPENSSL_riscvcap: RV64GC_ZBA_ZBB_ZBC_ZBS_ZKT_V - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} freebsd-x86_64: runs-on: ubuntu-latest