diff options
author | Christopher Parsons <cparsons@google.com> | 2023-04-21 13:51:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-21 13:51:22 +0000 |
commit | 84b467507fe71da5c981dd747d94333b73418452 (patch) | |
tree | f8b68ef22096cc0ee642a236093b7b9b785bf345 | |
parent | f636d24b8989d4d1f3bbcc460d587f61be0c912b (diff) | |
parent | 8d159256acb13df9ac7175fcb5dcd04c8ed7d060 (diff) | |
download | bazel-84b467507fe71da5c981dd747d94333b73418452.tar.gz |
Merge "improvements to determinism_test" am: 216298a2d7 am: e1a2b03468 am: 70060dbff1 am: 8d159256ac
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2552612
Change-Id: Idc9c214e11d76cecb854a4f6df84377dad1d3344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | ci/determinism_test.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/ci/determinism_test.sh b/ci/determinism_test.sh index 47baafbf..622bc0e3 100755 --- a/ci/determinism_test.sh +++ b/ci/determinism_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eux +#!/bin/bash -eu # Copyright (C) 2023 The Android Open Source Project # @@ -33,6 +33,16 @@ if [[ -z ${DIST_DIR+x} ]]; then DIST_DIR="${OUT_DIR}/dist" fi +if [[ -z ${TARGET_PRODUCT+x} ]]; then + echo "TARGET_PRODUCT not set. Using aosp_arm64" + TARGET_PRODUCT=aosp_arm64 +fi + +if [[ -z ${TARGET_BUILD_VARIANT+x} ]]; then + echo "TARGET_BUILD_VARIANT not set. Using userdebug" + TARGET_BUILD_VARIANT=userdebug +fi + UNAME="$(uname)" case "$UNAME" in Linux) @@ -55,8 +65,8 @@ function clean_build { --mk-metrics \ BAZEL_STARTUP_ARGS="--max_idle_secs=5" \ BAZEL_BUILD_ARGS="--color=no --curses=no --show_progress_rate_limit=5" \ - TARGET_PRODUCT=aosp_arm64 \ - TARGET_BUILD_VARIANT=userdebug \ + TARGET_PRODUCT=${TARGET_PRODUCT} \ + TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} \ nothing \ dist DIST_DIR=$DIST_DIR } @@ -65,6 +75,10 @@ function save_hash { local -r filepath="$1" find $OUT_DIR/soong/workspace -type f,l -iname "BUILD.bazel" -o -iname "*.bzl" | xargs "${PREBUILTS}"/md5sum > $filepath find $OUT_DIR/soong/soong_injection -type f,l | xargs "${PREBUILTS}"/md5sum >> $filepath + "${PREBUILTS}"/md5sum $OUT_DIR/soong/Android-${TARGET_PRODUCT}.mk >> $filepath + if [[ -z ${SKIP_NINJA_CHECK+x} ]]; then + "${PREBUILTS}"/md5sum $OUT_DIR/soong/build.ninja >> $filepath + fi } TESTDIR=$(mktemp -t testdir.XXXXXX -d) |