commit 8d92561f2478e27aeaae0157cf7b21770ffcb7e1
author Zhuoyao Zhang <zhuoyao@google.com> Fri Jul 21 10:54:52 2017 -0700
committer Zhuoyao Zhang <zhuoyao@google.com> Tue Jul 25 20:17:43 2017 +0000
tree 1aa04ac696dc84a26067c008c4ab903335e1e259
parent e12872552f85a9c31ddda4d45363d1adf4dca31d

Fix VtsFmqUnitTest.

* Push dependent files to /data instead /system partition.
* Configure the env and args for running the test.

Bug:63704014
Bug:63867578

Test: make vts
      vts-tradefed run vts -m VtsFmqUnitTest.

Change-Id: If5eb4b372d0d6411a1494c70b792e7542e0e9e65
Merged-In: If5eb4b372d0d6411a1494c70b792e7542e0e9e65
(cherry picked from commit f2681fb1cdf983b4fafbd537563720608a74c7d3)

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index f4e7945..f3ec4cd 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -17,20 +17,25 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="HostDrivenTest.push" />
         <option name="cleanup" value="true" />
-        <option name="remount-system" 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/nativetest64/hidl_test_helper->/data/nativetest64/hidl_test_helper" />
         <option name="push" value="DATA/nativetest64/fmq_test->/data/nativetest64/fmq_test" />
-        <option name="push" value="DATA/lib64/hw/android.hardware.tests.msgq@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.msgq@1.0-impl.so" />
-        <option name="push" value="DATA/lib/hw/android.hardware.tests.msgq@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.msgq@1.0-impl.so" />
+        <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" />
+        <option name="push" value="DATA/lib/hw/android.hardware.tests.msgq@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.msgq@1.0-impl.so" />
+        <option name="push" value="DATA/lib64/hw/android.hardware.tests.msgq@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.msgq@1.0-impl.so" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <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="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-envp" value="TREBLE_TESTING_OVERRIDE=true" />
+        <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" />
     </test>
 </configuration>