diff options
| author | Christopher Parsons <cparsons@google.com> | 2023-04-21 11:23:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-04-21 11:23:06 +0000 |
| commit | 216298a2d7080c470e603180b9435dedceca053d (patch) | |
| tree | f8b68ef22096cc0ee642a236093b7b9b785bf345 | |
| parent | ec45c46c7db50d5a81b56eba48b106fc0d9550f9 (diff) | |
| parent | 34650543637c25081525c3b729f4e6e5925046d9 (diff) | |
| download | bazel-216298a2d7080c470e603180b9435dedceca053d.tar.gz | |
Merge "improvements to determinism_test"
| -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) |