diff options
| author | MarkDacek <dacek@google.com> | 2023-01-17 20:55:08 +0000 |
|---|---|---|
| committer | MarkDacek <dacek@google.com> | 2023-01-19 19:16:53 +0000 |
| commit | 046d6a49abc432e13492432debfe50ec3acd291f (patch) | |
| tree | bf8be2db186f600e303724258d86d1cb15d4df7f /ci | |
| parent | 4dcacbb47e6bd7244b1fc25d8edc240ca61b0b80 (diff) | |
| download | bazel-046d6a49abc432e13492432debfe50ec3acd291f.tar.gz | |
Modify mixed_mode_toggle test to check for bazel output files.
Currently, only the presence of "bazel-out" is checked.
Bug: 256907680
Test: run the script
Change-Id: Iafbaedd9db26a40878c3234e5b1a692e9d6ab5db
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/mixed_mode_toggle.sh | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/ci/mixed_mode_toggle.sh b/ci/mixed_mode_toggle.sh index f61d4944..50fba89c 100755 --- a/ci/mixed_mode_toggle.sh +++ b/ci/mixed_mode_toggle.sh @@ -36,9 +36,18 @@ build/soong/soong_ui.bash --make-mode \ BAZEL_BUILD_ARGS="--color=no --curses=no --show_progress_rate_limit=5" \ TARGET_PRODUCT=aosp_arm64 \ TARGET_BUILD_VARIANT=userdebug \ - nothing \ + com.android.tzdata \ dist DIST_DIR=$DIST_DIR + +# PLEASE NOTE - IF TZDATA IS EVER REMOVED FROM THE PROD ALLOWLIST, THIS _WILL_ FAIL +# Should that happen, look into reverting to the assertions on bazel-out or switching + +if [[ ! $(ls out/bazel/output/execroot/__main__/bazel-out/aosp_arm64-userdebug-opt-ST-743b56eaae08/bin/system/timezone/apex/com.android.tzdata_staging_dir/etc/tz/tzdata) ]] ; then + echo "Expected tzdata files under bazel-out" + exit 1 +fi + # Default setting should contain bazel-out, as *at least* tzdata is allowlisted for # default prod mode. if [[ $(grep -L "bazel-out" ${OUT_DIR}/soong/build.ninja) ]]; then @@ -59,11 +68,15 @@ build/soong/soong_ui.bash --make-mode \ nothing \ dist DIST_DIR=$DIST_DIR +# Note - we could m clean and assert that the bazel build doesn't exist, but this is +# a better use of time if [[ ! $(grep -L "bazel-out" ${OUT_DIR}/soong/build.ninja) ]]; then echo "Expected BUILD_BROKEN override to not reference bazel-out" exit 1 fi +build/soong/soong_ui.bash --make-mode clean + # Rerun default setting. This verifies that removing BUILD_BROKEN_DISABLE_BAZEL # causes analysis to be rerun. build/soong/soong_ui.bash --make-mode \ @@ -72,14 +85,21 @@ build/soong/soong_ui.bash --make-mode \ BAZEL_BUILD_ARGS="--color=no --curses=no --show_progress_rate_limit=5" \ TARGET_PRODUCT=aosp_arm64 \ TARGET_BUILD_VARIANT=userdebug \ - nothing \ + com.android.tzdata \ dist DIST_DIR=$DIST_DIR +if [[ ! $(ls out/bazel/output/execroot/__main__/bazel-out/aosp_arm64-userdebug-opt-ST-743b56eaae08/bin/system/timezone/apex/com.android.tzdata_staging_dir/etc/tz/tzdata) ]] ; then + echo "Expected tzdata files under bazel-out" + exit 1 +fi + if [[ $(grep -L "bazel-out" ${OUT_DIR}/soong/build.ninja) ]]; then echo "Expected default build rerun to reference bazel-out" exit 1 fi +build/soong/soong_ui.bash --make-mode clean + # Regen ninja file with mixed builds dev mode. build/soong/soong_ui.bash --make-mode \ --mk-metrics \ @@ -88,9 +108,14 @@ build/soong/soong_ui.bash --make-mode \ BAZEL_BUILD_ARGS="--color=no --curses=no --show_progress_rate_limit=5" \ TARGET_PRODUCT=aosp_arm64 \ TARGET_BUILD_VARIANT=userdebug \ - nothing \ + com.android.tzdata \ dist DIST_DIR=$DIST_DIR +if [[ ! $(ls out/bazel/output/execroot/__main__/bazel-out/aosp_arm64-userdebug-opt-ST-743b56eaae08/bin/system/timezone/apex/com.android.tzdata_staging_dir/etc/tz/tzdata) ]] ; then + echo "Expected tzdata files under bazel-out" + exit 1 +fi + if [[ $(grep -L "bazel-out" ${OUT_DIR}/soong/build.ninja) ]]; then echo "Expected dev mode build to reference bazel-out" exit 1 |