diff options
author | Devin Moore <devinmoore@google.com> | 2023-11-28 23:46:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 23:46:39 +0000 |
commit | 1780806de4fea1475b06f7d7e5b321294147c1d9 (patch) | |
tree | e7309564cb1b269788eb9108e65b73c2e433bcaa | |
parent | f9e30cfc2f53445aea7fde9995fb3fcb14ea6972 (diff) | |
parent | 3d1f9b0bc918bf74dbe585076fce59152170e385 (diff) | |
download | hidl-1780806de4fea1475b06f7d7e5b321294147c1d9.tar.gz |
hidl_test* skip if hwservicemanager isn't installed am: 3d1f9b0bc9
Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2848151
Change-Id: I263eafe93af3e225a0c080848d45c42b46b48904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | test/hidl_test/hidl_test.py | 7 | ||||
-rw-r--r-- | test/java_test/hidl_test_java.py | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/test/hidl_test/hidl_test.py b/test/hidl_test/hidl_test.py index 802ddebc..42c999e0 100644 --- a/test/hidl_test/hidl_test.py +++ b/test/hidl_test/hidl_test.py @@ -26,6 +26,13 @@ def run_cmd(cmd, ignore_error=False): raise subprocess.CalledProcessError(p.returncode, cmd) return p.returncode +def has_hwservicemanager(): + # if the property is set, or hwservicemanager is missing, then we don't have + # hwservicemanger running. + return 0 != run_cmd("echo '[[ \"$(getprop hwservicemanager.disabled)\" == \"true\" ]] || " + + "[[ ! -f /system/bin/hwservicemanager ]]' | adb shell sh", ignore_error=True) + +@unittest.skipUnless(has_hwservicemanager(), "no hwservicemanager") class TestHidl(unittest.TestCase): pass diff --git a/test/java_test/hidl_test_java.py b/test/java_test/hidl_test_java.py index ccafd883..681935bc 100644 --- a/test/java_test/hidl_test_java.py +++ b/test/java_test/hidl_test_java.py @@ -28,6 +28,14 @@ def run_cmd(cmd, ignore_error=False): raise subprocess.CalledProcessError(p.returncode, cmd) return p.returncode + +def has_hwservicemanager(): + # if the property is set, or hwservicemanager is missing, then we don't have + # hwservicemanger running. + return 0 != run_cmd("echo '[[ \"$(getprop hwservicemanager.disabled)\" == \"true\" ]] || " + + "[[ ! -f /system/bin/hwservicemanager ]]' | adb shell sh", ignore_error=True) + +@unittest.skipUnless(has_hwservicemanager(), "no hwservicemanager") class TestHidlJava(unittest.TestCase): pass |