From 8f41667b37c3d22d5fad6798abb5d95f6e6a7cff Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Fri, 11 Apr 2025 16:13:16 +0200 Subject: [PATCH] ci/android: specify EXCLUDE_FILTERS after INCLUDE_FILTERS when launching Android CTS Specify EXCLUDE_FILTERS after INCLUDE_FILTERS when launching Android CTS, to make it clearer that exclude filters take the precedence on include filters. This change is not strictly necessary, according to the documentation exclude filters take the precedence anyway, see https://source.android.com/docs/core/tests/tradefed/testing/through-suite/option-passing#pass_filters_to_the_suite So this change is added only to document the behavior rather then to control it. Part-of: --- .gitlab-ci/android-cts-runner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/android-cts-runner.sh b/.gitlab-ci/android-cts-runner.sh index b4fb77fe2f9..6f714b9880d 100755 --- a/.gitlab-ci/android-cts-runner.sh +++ b/.gitlab-ci/android-cts-runner.sh @@ -27,8 +27,8 @@ fi set +e eval "/android-tools/android-cts/tools/cts-tradefed" run commandAndExit cts-dev \ - $EXCLUDE_FILTERS \ - $INCLUDE_FILTERS + $INCLUDE_FILTERS \ + $EXCLUDE_FILTERS [ "$(grep "^FAILED" /android-tools/android-cts/results/latest/invocation_summary.txt | tr -d ' ' | cut -d ':' -f 2)" = "0" ]