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

Merge "Update apex_comparison_test.sh to support CFI" am: 921292b1ed

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2598647

Change-Id: I86094ae5ffee34776ab6bd00be27a82196c37008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2023-06-05 22:56:50 +00:00
committed by Automerger Merge Worker
parent 066f5c739d 921292b1ed
commit 03454ac9a7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/apex_comparison_tests.sh
View File

@@ -29,7 +29,7 @@ fi
# Test Setup
############
OUTPUT_DIR="$(mktemp -d tmp.XXXXXX)"
OUTPUT_DIR="$(mktemp -d $(pwd)/tmp.XXXXXX)"
SOONG_OUTPUT_DIR="$OUTPUT_DIR/soong"
BAZEL_OUTPUT_DIR="$OUTPUT_DIR/bazel"
@@ -45,6 +45,12 @@ function cleanup {
call_bazel clean
rm -rf "${OUTPUT_DIR}"
}
function deapexer() {
DEBUGFS_PATH="$(realpath $(call_bazel cquery --config=bp2build --config=linux_x86_64 --config=ci --output=files //external/e2fsprogs/debugfs))"
call_bazel run --config=bp2build //system/apex/tools:deapexer -- --debugfs_path=$DEBUGFS_PATH $@
}
trap cleanup EXIT
###########
@@ -72,10 +78,7 @@ BAZEL_TZDATA="$(realpath $(call_bazel cquery --config=bp2build --config=android
BAZEL_MINIMAL="$(realpath $(call_bazel cquery --config=bp2build --config=android --config=ci --output=files //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal))"
# # 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 //system/apex/tools:deapexer
DEBUGFS_PATH="$(realpath $(call_bazel cquery --config=bp2build --config=linux_x86_64 --config=ci --output=files //external/e2fsprogs/debugfs))"
DEAPEXER="bazel-bin/system/apex/tools/deapexer"
DEAPEXER="$DEAPEXER --debugfs_path=$DEBUGFS_PATH"
call_bazel build --config=bp2build --config=linux_x86_64 //external/e2fsprogs/debugfs
#######
# Tests
@@ -91,8 +94,8 @@ function compare_deapexer_list() {
local SOONG_LIST="$OUTPUT_DIR/soong.list"
local BAZEL_LIST="$OUTPUT_DIR/bazel.list"
$DEAPEXER list "$SOONG_APEX" > "$SOONG_LIST"
$DEAPEXER list "$BAZEL_APEX" > "$BAZEL_LIST"
deapexer list "$SOONG_APEX" > "$SOONG_LIST"
deapexer list "$BAZEL_APEX" > "$BAZEL_LIST"
if cmp -s "$SOONG_LIST" "$BAZEL_LIST"
then