diff options
| author | Joshua Duong <joshuaduong@google.com> | 2023-08-26 17:17:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-26 17:17:39 +0000 |
| commit | 4bd9f9eca480efc9a6ee7cff412388c4ce8d78fa (patch) | |
| tree | e2711d3942a27a55079a12eb0d5c804cc68bd51d | |
| parent | 944f161b9c6c4e219b585438b8f61f456ce7df7f (diff) | |
| download | adt-infra-4bd9f9eca480efc9a6ee7cff412388c4ce8d78fa.tar.gz | |
Revert "Change warn to panic if no display is detected."
This reverts commit 944f161b9c6c4e219b585438b8f61f456ce7df7f.
Reason for revert: M1 tests known to work, but reporting no display
Change-Id: Ia4df058a11c64cceebb233d28edba4a23c28589e
| -rw-r--r-- | emu_test/utils/common.sh | 2 | ||||
| -rw-r--r-- | pytest/test_embedded/shell/utils/common.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/emu_test/utils/common.sh b/emu_test/utils/common.sh index 363778d7..375c5954 100644 --- a/emu_test/utils/common.sh +++ b/emu_test/utils/common.sh @@ -720,7 +720,7 @@ check_physical_display() { # Connection Type: Internal display_type=$(system_profiler SPDisplaysDataType | grep "^[[:blank:]]*Displays:") if [ -z "$display_type" ]; then - panic "No physical display detected. Skipping tests and marking build as failed." + warn "No physical display detected. Tests may fail." else printf "Display type found.\n" fi diff --git a/pytest/test_embedded/shell/utils/common.sh b/pytest/test_embedded/shell/utils/common.sh index c801c860..bc1d1993 100644 --- a/pytest/test_embedded/shell/utils/common.sh +++ b/pytest/test_embedded/shell/utils/common.sh @@ -714,7 +714,7 @@ check_physical_display() { # Total Number of Cores: 16 # Vendor: Apple (0x106b) # Metal Support: Metal 3 - # Displays: ### This will be absent if no display is detected + # Displays: # Color LCD: # Display Type: Built-in Liquid Retina XDR Display # Resolution: 3456 x 2234 Retina @@ -725,7 +725,7 @@ check_physical_display() { # Connection Type: Internal display_type=$(system_profiler SPDisplaysDataType | grep "^[[:blank:]]*Displays:") if [ -z "$display_type" ]; then - panic "No physical display detected. Skipping tests and marking build as failed." + warn "No physical display detected. Tests may fail." else printf "Display type found.\n" fi |