hidl_test* skip if hwservicemanager isn't installed am: 3d1f9b0bc9 am: fa294b82d2

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2848151

Change-Id: Ia5abce2dcd18f39bf2cfbdd556310346a966ec38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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