StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add soong integration test for Bazel-built apexes of 64bit only products."

Browse Source
This commit is contained in:
Wei Li
2022-12-06 19:28:46 +00:00
committed by Gerrit Code Review
parent d53878e2f0 94bf3158fd
commit 007d75aab0
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/apex_comparison_tests.sh
View File

@@ -29,10 +29,13 @@ fi
# Test Setup # Test Setup
############ ############
OUTPUT_DIR="$(mktemp -d)" OUTPUT_DIR="$(mktemp -d tmp.XXXXXX)"
SOONG_OUTPUT_DIR="$OUTPUT_DIR/soong" SOONG_OUTPUT_DIR="$OUTPUT_DIR/soong"
BAZEL_OUTPUT_DIR="$OUTPUT_DIR/bazel" BAZEL_OUTPUT_DIR="$OUTPUT_DIR/bazel"
export TARGET_PRODUCT="module_arm"
[ "$#" -eq 1 ] && export TARGET_PRODUCT="$1"
function call_bazel() { function call_bazel() {
build/bazel/bin/bazel --output_base="$BAZEL_OUTPUT_DIR" $@ build/bazel/bin/bazel --output_base="$BAZEL_OUTPUT_DIR" $@
} }
@@ -50,7 +53,7 @@ trap cleanup EXIT
export UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true # don't rely on prebuilts export UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true # don't rely on prebuilts
export TARGET_BUILD_APPS="com.android.adbd com.android.tzdata build.bazel.examples.apex.minimal" export TARGET_BUILD_APPS="com.android.adbd com.android.tzdata build.bazel.examples.apex.minimal"
packages/modules/common/build/build_unbundled_mainline_module.sh \ packages/modules/common/build/build_unbundled_mainline_module.sh \
--product module_arm \ --product "$TARGET_PRODUCT" \
--dist_dir "$SOONG_OUTPUT_DIR" --dist_dir "$SOONG_OUTPUT_DIR"
###################### ######################
@@ -60,22 +63,15 @@ build/soong/soong_ui.bash --make-mode BP2BUILD_VERBOSE=1 --skip-soong-tests bp2b
BAZEL_OUT="$(call_bazel info --config=bp2build output_path)" BAZEL_OUT="$(call_bazel info --config=bp2build output_path)"
export TARGET_PRODUCT="module_arm"
call_bazel build --config=bp2build --config=ci --config=android \ call_bazel build --config=bp2build --config=ci --config=android \
//packages/modules/adb/apex:com.android.adbd \ //packages/modules/adb/apex:com.android.adbd \
//system/timezone/apex:com.android.tzdata \ //system/timezone/apex:com.android.tzdata \
//build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal.apex
# Build debugfs separately, as it's not a dep of apexer, but needs to be an explicit arg. # Build debugfs separately, as it's not a dep of apexer, but needs to be an explicit arg.
call_bazel build --config=bp2build --config=linux_x86_64 //external/e2fsprogs/debugfs call_bazel build --config=bp2build --config=linux_x86_64 //external/e2fsprogs/debugfs //system/apex/tools:deapexer
DEBUGFS_PATH="$BAZEL_OUT/linux_x86_64-fastbuild/bin/external/e2fsprogs/debugfs/debugfs" DEBUGFS_PATH="$BAZEL_OUT/linux_x86_64-fastbuild/bin/external/e2fsprogs/debugfs/debugfs"
DEAPEXER="$BAZEL_OUT/linux_x86_64-fastbuild/bin/system/apex/tools/deapexer --debugfs_path=$DEBUGFS_PATH"
function run_deapexer() {
call_bazel run --config=bp2build --config=linux_x86_64 //system/apex/tools:deapexer \
-- \
--debugfs_path="$DEBUGFS_PATH" \
$@
}
####### #######
# Tests # Tests
@@ -92,8 +88,8 @@ function compare_deapexer_list() {
local SOONG_LIST="$OUTPUT_DIR/soong.list" local SOONG_LIST="$OUTPUT_DIR/soong.list"
local BAZEL_LIST="$OUTPUT_DIR/bazel.list" local BAZEL_LIST="$OUTPUT_DIR/bazel.list"
run_deapexer list "$SOONG_APEX" > "$SOONG_LIST" $DEAPEXER list "$SOONG_APEX" > "$SOONG_LIST"
run_deapexer list "$BAZEL_APEX" > "$BAZEL_LIST" $DEAPEXER list "$BAZEL_APEX" > "$BAZEL_LIST"
if cmp -s "$SOONG_LIST" "$BAZEL_LIST" if cmp -s "$SOONG_LIST" "$BAZEL_LIST"
then then

1
tests/run_integration_tests.sh
View File

@@ -13,3 +13,4 @@ TOP="$(readlink -f "$(dirname "$0")"/../../..)"
# The following tests build against the full source tree and don't rely on the # The following tests build against the full source tree and don't rely on the
# mock client. # mock client.
"$TOP/build/soong/tests/apex_comparison_tests.sh" "$TOP/build/soong/tests/apex_comparison_tests.sh"
"$TOP/build/soong/tests/apex_comparison_tests.sh" "module_arm64only"