diff options
| author | Kalesh Singh <kaleshsingh@google.com> | 2023-09-27 00:13:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-27 00:13:33 +0000 |
| commit | 9b1626a8a4a65e1e4f9adc17c9d2a41846b6f600 (patch) | |
| tree | 1b4377c06164b04ab7ff86996a7ad5c2fcef1966 | |
| parent | dcb697efc5887c247ad3e520c00d6e171555d585 (diff) | |
| parent | 9ba8e81cf4a9a817497dc049173479b84d8a89fa (diff) | |
| download | interfaces-android14-tests-dev.tar.gz | |
SuspendSepolicyTests: Ignore already labeled wakeup nodes am: 9ba8e81cf4android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android14-tests-releaseandroid14-tests-dev
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2763745
Change-Id: I31f242f2c7191cb92b4f98ff689596b6050c55c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | suspend/1.0/default/SuspendSepolicyTests.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/suspend/1.0/default/SuspendSepolicyTests.sh b/suspend/1.0/default/SuspendSepolicyTests.sh index b40f798..0dd2a3e 100755 --- a/suspend/1.0/default/SuspendSepolicyTests.sh +++ b/suspend/1.0/default/SuspendSepolicyTests.sh @@ -49,13 +49,15 @@ check_wakeup_dup() { # wakeup_path get_unlabeled_wakeup_paths() { for path in ${wakeup_paths[@]}; do + wakeup_path="$path" + has_wakeup_attr "$wakeup_path" && continue + # If there exists a common wakeup parent directory, label that instead # of each wakeupN directory - wakeup_path="$path" dir_path="$(dirname $path)" [ "$(basename $dir_path)" == "wakeup" ] && wakeup_path="$dir_path" - has_wakeup_attr "$wakeup_path" || check_wakeup_dup $wakeup_path \ - || unlabeled_paths+=( $wakeup_path ) + + check_wakeup_dup $wakeup_path || unlabeled_paths+=( $wakeup_path ) done } |