Skip to content

Commit db7de02

Browse files
committed
Skip test InvokeConnectCallback
1 parent d85f2e4 commit db7de02

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

crypto/bio/bio_test.cc

+5
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,10 @@ static long callback(BIO *b, int state, int res) {
911911
}
912912

913913
TEST(BIOTest, InvokeConnectCallback) {
914+
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
915+
GTEST_SKIP() << "InvokeConnectCallback does not run on iOS";
916+
#endif
917+
914918
ASSERT_EQ(callback_invoked, 0);
915919
BIO *bio = BIO_new(BIO_s_connect());
916920
ASSERT_NE(bio, nullptr);
@@ -926,6 +930,7 @@ TEST(BIOTest, InvokeConnectCallback) {
926930
}
927931
} // namespace
928932

933+
929934
// Instantiate the parameterized test suite for BIOPairTest
930935
// This creates test instances for all combinations of the boolean parameters
931936
//

tests/ci/run_ios_sim_tests.sh

+13-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
# SPDX-License-Identifier: Apache-2.0 OR ISC
44

5-
set -e
5+
# Setup Xcode commands:
6+
# > xcodebuild -runFirstLaunch
7+
# > sudo xcodebuild -license accept
8+
# > xcode-select --install
9+
#
10+
# Install iOS simulator commands:
11+
# > xcodebuild -downloadPlatform iOS -exportPath ~/Download -buildVersion 17.0
12+
13+
set -ex
614

715
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
816
SCRIPT_DIR="$(readlink -f "${SCRIPT_DIR}")"
@@ -39,16 +47,14 @@ function find_mount() {
3947
}
4048

4149
function find_runtime_root() {
42-
find "${1}" -type d -name "RuntimeRoot" |head -n 1
50+
find "${1}" -type d -name "RuntimeRoot" | head -n 1
4351
}
4452

45-
4653
IMAGE_LIST_SIZE=$(plist_count_images)
4754
IMAGE_LIST_LAST_IDX=$(( "${IMAGE_LIST_SIZE}" - 1 ))
4855
IMAGE_PATH=''
4956
IMAGE_BUILD=''
5057

51-
5258
for i in $(seq 0 "${IMAGE_LIST_LAST_IDX}"); do
5359
if [[ $(plist_image_id_for "${i}") == *"${SIM_IMAGE_PATTERN}"* ]]; then
5460
IMAGE_PATH=$(plist_image_path_for "${i}")
@@ -84,8 +90,9 @@ export DYLD_ROOT_PATH
8490

8591
pushd "${SRC_ROOT}"
8692

87-
CMAKE_PARAMS=("-DCMAKE_OSX_ARCHITECTURES=arm64" "-DCMAKE_SYSTEM_PROCESSOR=arm64" "-DCMAKE_OSX_SYSROOT=iphonesimulator" "-DCMAKE_THREAD_LIBS_INIT=-lpthread" "-DBUILD_TOOL=0")
88-
build_and_test "${CMAKE_PARAMS[@]}"
93+
CMAKE_PARAMS=("-DCMAKE_SYSTEM_NAME=iOS" "-DCMAKE_OSX_ARCHITECTURES=arm64" "-DCMAKE_SYSTEM_PROCESSOR=arm64" "-DCMAKE_OSX_SYSROOT=iphonesimulator" "-DCMAKE_THREAD_LIBS_INIT=-lpthread" "-DBUILD_TOOL=0")
94+
run_build "${CMAKE_PARAMS[@]}"
95+
run_cmake_custom_target 'run_tests'
8996

9097
popd
9198

0 commit comments

Comments
 (0)