Skip to content

Commit

Permalink
Run crypto tests (only) under BoringSSL from unified build (#21168) (#…
Browse files Browse the repository at this point in the history
…21200)

Add a new default option enable_host_clang_boringssl_crypto_tests
to the unified build that runs the tests from src/crypto and
src/credentials only.

Also add an option enable_host_clang_boringssl_build that runs all of
the tests (and builds any tools), which is not enabled by default.

This gives some coverage to BoringSSL without costing a full build
(it would be even cheaper if we could swap out the CryptoPAL via
the command line..)

Co-authored-by: Michael Spang <[email protected]>
  • Loading branch information
woody-apple and mspang authored Jul 29, 2022
1 parent 588368d commit 9be374f
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 4 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,14 @@ jobs:
# (similar to what examples-linux-standalone.yaml
# does), so use target_os="all" to get those picked
# up as part of the "unified" build. But then to
# save CI resources we want to exclude the
# "host clang" build, which uses the pigweed
# clang.
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
# save CI resources we want to exclude a few
# redundant things:
#
# * the mbedtls build, since we don't really plan to
# use that on Darwin.
# * the "host clang" build, which uses the pigweed
# clang.
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false enable_host_clang_boringssl_crypto_tests=false';;
"python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
esac
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
Expand Down
24 changes: 24 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,13 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
enable_default_builds && host_os != "win" &&
!(is_asan == true && host_os == "mac")

# Enable building chip with clang & boringssl
enable_host_clang_boringssl_build = false

# Enable limited testing with clang & boringssl
enable_host_clang_boringssl_crypto_tests =
enable_default_builds && host_os != "win"

# Build the chip-cert tool.
enable_standalone_chip_cert_build =
enable_default_builds && host_os != "win" && chip_crypto == "openssl"
Expand Down Expand Up @@ -352,6 +359,23 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
}
}

if (enable_host_clang_boringssl_build) {
chip_build("host_clang_boringssl") {
toolchain = "${chip_root}/config/boringssl/toolchain:${host_os}_${host_cpu}_clang_boringssl"
}

builds += [ ":host_clang_boringssl" ]
}

if (enable_host_clang_boringssl_crypto_tests) {
chip_build("host_clang_boringssl_crypto_tests") {
test_group = "//src:crypto_tests"
toolchain = "${chip_root}/config/boringssl/toolchain:${host_os}_${host_cpu}_clang_boringssl"
}

builds += [ ":host_clang_boringssl_crypto_tests" ]
}

if (enable_android_builds) {
chip_build("android_arm") {
toolchain = "${build_root}/toolchain/android:android_arm"
Expand Down
26 changes: 26 additions & 0 deletions config/boringssl/toolchain/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/build.gni")

import("${build_root}/toolchain/gcc_toolchain.gni")

gcc_toolchain("${host_os}_${host_cpu}_clang_boringssl") {
toolchain_args = {
current_os = host_os
current_cpu = host_cpu
is_clang = true
chip_crypto = "boringssl"
}
}

0 comments on commit 9be374f

Please sign in to comment.