commit 387bd2263d1159539712b38a3119a4645b9aca0e
author android-build-team Robot <android-build-team-robot@google.com> Sun Oct 08 08:05:21 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Oct 08 08:05:21 2017 +0000
tree 6ab2e76a7063307bf7c4b392ae2c47d52f2f8c6a
parent 114e68b56e47365a22531c0fdc9202a4be10745e
parent 680f614a577c666e6b5f87c66559af4cafb1b3d0

Snap for 4383777 from 680f614a577c666e6b5f87c66559af4cafb1b3d0 to pi-release

Change-Id: If67866cee9087718296de96e3778afb4a1de982b

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index f861a10..9e30703 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -17,10 +17,10 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
-        <option name="push" value="DATA/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
-        <option name="push" value="DATA/nativetest/mq_test_client/mq_test_client->/data/nativetest/mq_test_client/mq_test_client" />
-        <option name="push" value="DATA/nativetest64/mq_test_client/mq_test_client->/data/nativetest64/mq_test_client/mq_test_client" />
+        <option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/local/tmp/32/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
+        <option name="push" value="DATA/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test->/data/local/tmp/64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" />
+        <option name="push" value="DATA/nativetest/mq_test_client/mq_test_client->/data/local/tmp/32/mq_test_client/mq_test_client" />
+        <option name="push" value="DATA/nativetest64/mq_test_client/mq_test_client->/data/local/tmp/64/mq_test_client/mq_test_client" />
         <option name="push" value="DATA/nativetest64/hidl_test_helper->/data/nativetest64/hidl_test_helper" />
         <option name="push" value="DATA/lib/android.hardware.tests.msgq@1.0.so->/data/local/tmp/system/lib/android.hardware.tests.msgq@1.0.so" />
         <option name="push" value="DATA/lib64/android.hardware.tests.msgq@1.0.so->/data/local/tmp/system/lib64/android.hardware.tests.msgq@1.0.so" />
@@ -31,10 +31,9 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsFmqUnitTests" />
         <option name="binary-test-type" value="binary_test" />
-        <option name="binary-test-source" value="DATA/nativetest64/fmq_test->/data/nativetest64/fmq_test" />
+        <option name="binary-test-source" value="DATA/nativetest64/fmq_test->/data/local/tmp/64/fmq_test" />
         <option name="binary-test-envp" value="VTS_ROOT_PATH=/data/local/tmp" />
-        <option name="binary-test-args" value="-x /data/local/tmp/system/lib" />
-        <option name="binary-test-args" value="-y /data/local/tmp/system/lib64" />
+        <option name="binary-test-args" value="-mVTS" />
         <option name="test-timeout" value="1m"/>
     </test>
 </configuration>

tests/fmq_test

diff --git a/tests/fmq_test b/tests/fmq_test
index 02683c9..9bd6464 100644
--- a/tests/fmq_test
+++ b/tests/fmq_test
@@ -1,9 +1,25 @@
 source /data/nativetest64/hidl_test_helper
 
-TREBLE_TESTING_OVERRIDE=true run_all_tests \
-    "/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
-    "/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
-    "/data/nativetest/mq_test_client/mq_test_client" \
-    "/data/nativetest64/mq_test_client/mq_test_client" \
-    "fmq_test" \
-    "$@"
+function run_fmq_test() {
+    local RUN_MODE=$1
+    if [ "${RUN_MODE}" == "-mVTS" ]; then
+       TREBLE_TESTING_OVERRIDE=true run_all_tests \
+         "/data/local/tmp/32/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+         "/data/local/tmp/64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+         "/data/local/tmp/32/mq_test_client/mq_test_client" \
+         "/data/local/tmp/64/mq_test_client/mq_test_client" \
+         "fmq_test" \
+         "-x/data/local/tmp/system/lib" \
+         "-y/data/local/tmp/system/lib64"
+    else
+       TREBLE_TESTING_OVERRIDE=true run_all_tests \
+          "/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+          "/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
+          "/data/nativetest/mq_test_client/mq_test_client" \
+          "/data/nativetest64/mq_test_client/mq_test_client" \
+          "fmq_test"
+    fi
+}
+
+run_fmq_test $@
+