Narrow ARM64 *BSD testing to libcrypto

aws · Dec 3, 2024 · de57e08 · de57e08
1 parent fb423c6
commit de57e08
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml
@@ -434,6 +434,7 @@ jobs:
     runs-on: ubuntu-latest
     name: OpenBSD ${{ matrix.version }} (${{ matrix.arch }}) test
     strategy:
+      fail-fast: false
       matrix:
         arch: ["x86-64", "arm64"]
         version: ["7.5", "7.6"]

diff --git a/tests/ci/gtest_util.sh b/tests/ci/gtest_util.sh
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
 function shard_gtest() {
-    export GTEST_TOTAL_SHARDS=$(nproc --all)
+    export GTEST_TOTAL_SHARDS=${NUM_CPU_THREADS}
     if [ -n "${2}" ]; then
         GTEST_TOTAL_SHARDS="${2}"
     fi

diff --git a/tests/ci/run_bsd_tests.sh b/tests/ci/run_bsd_tests.sh
@@ -6,15 +6,34 @@ set -ex
 
 source tests/ci/common_posix_setup.sh
 
-echo "Testing AWS-LC shared library in release mode."
-build_and_test -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1
-
 if [ "$PLATFORM" != "amd64" ] && [ "$PLATFORM" != "x86_64" ]; then
-    # ARM64 platforms are tested via emulation, so the test durations exceed our 1 hour expectation
+    # ARM64 platforms are tested via emulation.
+    # We narrow testing to libcrypto to avoid exceeding 1 hour duration
+    SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+    SCRIPT_DIR="$(readlink -f "${SCRIPT_DIR}")"
+    source "${SCRIPT_DIR}/gtest_util.sh"
+
+    run_build all
+
+    shard_gtest "${BUILD_ROOT}/crypto/crypto_test --gtest_also_run_disabled_tests"
+    shard_gtest ${BUILD_ROOT}/crypto/urandom_test
+    shard_gtest ${BUILD_ROOT}/crypto/mem_test
+    shard_gtest ${BUILD_ROOT}/crypto/mem_set_test
+    shard_gtest ${BUILD_ROOT}/crypto/rwlock_static_init
+
+    shard_gtest ${BUILD_ROOT}/ssl/ssl_test
+    shard_gtest ${BUILD_ROOT}/ssl/integration_test
+
+    # Due to its special linkage, this does not use GoogleTest
+    ${BUILD_ROOT}/crypto/dynamic_loading_test
+
     echo "Skipping further testing for $KERNEL_NAME $PLATFORM"
     exit 0
 fi
 
+echo "Testing AWS-LC shared library in release mode."
+build_and_test -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1
+
 echo "Testing AWS-LC static library in release mode."
 build_and_test -DCMAKE_BUILD_TYPE=Release