Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Trim some redundant Arm feature detection files" #1979

Merged
merged 7 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Narrow ARM64 *BSD testing to libcrypto
  • Loading branch information
justsmth committed Dec 3, 2024
commit de57e080679937ccbe0253e045a0636cc071fe71
1 change: 1 addition & 0 deletions .github/workflows/actions-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/gtest_util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 23 additions & 4 deletions tests/ci/run_bsd_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading