diff options
| author | 2024-11-13 19:28:23 +0000 | |
|---|---|---|
| committer | 2024-11-13 19:28:23 +0000 | |
| commit | e0be8d41495a27c1cd7e48e3569cfbf106732952 (patch) | |
| tree | 9c8533e7ecc032efacd204c69d6e36786f185fae | |
| parent | 47f505bb5cbcbdb20734ab8d788de8f02812fe55 (diff) | |
| parent | 1f0a87ef4dd024b0ad409972808f511a15b4bd44 (diff) | |
Merge "Improve run-ravenwood-tests.sh" into main am: 1f0a87ef4d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3340862
Change-Id: I5ecf36f7115f2c8cf4dd4687131c3c5ce33303bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | ravenwood/scripts/run-ravenwood-tests.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ravenwood/scripts/run-ravenwood-tests.sh b/ravenwood/scripts/run-ravenwood-tests.sh index fe2269a8dc38..27c5ea1bd0d7 100755 --- a/ravenwood/scripts/run-ravenwood-tests.sh +++ b/ravenwood/scripts/run-ravenwood-tests.sh @@ -33,7 +33,7 @@ include_re="" exclude_re="" smoke_exclude_re="" dry_run="" -while getopts "sx:f:dt" opt; do +while getopts "sx:f:dtb" opt; do case "$opt" in s) # Remove slow tests. @@ -52,8 +52,13 @@ case "$opt" in dry_run="echo" ;; t) + # Redirect log to terminal export RAVENWOOD_LOG_OUT=$(tty) ;; + b) + # Build only + ATEST=m + ;; '?') exit 1 ;; @@ -99,11 +104,16 @@ done # Calculate the removed tests. -diff="$(diff <(echo "${all_tests[@]}" | tr ' ' '\n') <(echo "${targets[@]}" | tr ' ' '\n') )" +diff="$(diff <(echo "${all_tests[@]}" | tr ' ' '\n') <(echo "${targets[@]}" | tr ' ' '\n') | grep -v [0-9] )" if [[ "$diff" != "" ]]; then echo "Excluded tests:" echo "$diff" fi -$dry_run ${ATEST:-atest} "${targets[@]}" +run() { + echo "Running: ${@}" + "${@}" +} + +run $dry_run ${ATEST:-atest} "${targets[@]}" |