From 3d1f9b0bc918bf74dbe585076fce59152170e385 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Tue, 21 Nov 2023 22:28:28 +0000 Subject: hidl_test* skip if hwservicemanager isn't installed There is nothing to test in that case. Test: atest hidl_test hidl_java_test Bug: 218588089 Change-Id: I6b81a3129e03a9990b7f2ff6a814babdba74737e --- test/hidl_test/hidl_test.py | 7 +++++++ test/java_test/hidl_test_java.py | 8 ++++++++ 2 files changed, 15 insertions(+) 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 -- cgit v1.2.3