commit eb11c53a2f80209c3765201539e83dfb2eb5ed1a
author Steven Moreland <smoreland@google.com> Thu Oct 01 18:52:15 2020
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 01 18:52:15 2020
tree ad4d360fc7d71e64b206f1c83f70ecbb2f28cafe
parent 87c11de00642f64673cb11bc15994b8a442eecf5
parent 05a4b1f090977e9352d964cd0a293eb63187b35e

Merge "fmq_test_client device -> general-tests" am: 00286ae070 am: bc312b23d5 am: c637bdc7c5 am: 05a4b1f090

Original change: https://android-review.googlesource.com/c/platform/system/libfmq/+/1424992

Change-Id: I31ff0a71173c2cce59929d3c1863b74ba5bbc307

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index e30f22a..6e40276 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -69,7 +69,7 @@
             suffix: "64",
         },
     },
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests"],
 }
 
 cc_test {

tests/fmq_test.py

diff --git a/tests/fmq_test.py b/tests/fmq_test.py
index c086427..68114ad 100644
--- a/tests/fmq_test.py
+++ b/tests/fmq_test.py
@@ -41,18 +41,18 @@
             run_cmd("adb shell killall %s >/dev/null 2>&1" % server, ignore_error=True)
     return test
 
-def has_binary(binary):
-    return 0 == run_cmd("adb shell ls %s >/dev/null" % binary, ignore_error=True)
+def has_bitness(bitness):
+    return 0 == run_cmd("echo '[[ \"$(getprop ro.product.cpu.abilist%s)\" != \"\" ]]' | adb shell sh" % bitness, ignore_error=True)
 
 if __name__ == '__main__':
     clients = []
     servers = []
 
-    if has_binary("/data/nativetest/fmq_test_client/fmq_test_client"):
+    if has_bitness(32):
         clients += ["/data/nativetest/fmq_test_client/fmq_test_client"]
         servers += ["/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test"]
 
-    if has_binary("/data/nativetest64/fmq_test_client/fmq_test_client"):
+    if has_bitness(64):
         clients += ["/data/nativetest64/fmq_test_client/fmq_test_client"]
         servers += ["/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test"]