commit 9ed2ab88782a059876308daca3abdb81c8586b11
author Zhuoyao Zhang <zhuoyao@google.com> Fri Jul 21 20:53:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 20:53:54 2017 +0000
tree 553c50fa1b83d6d157b8ed12ae76fed0e944e322
parent 9383a33c37ba6007cc07827dcdb52d8bb181cdbc
parent f2681fb1cdf983b4fafbd537563720608a74c7d3

Fix VtsFmqUnitTest.
am: f2681fb1cd

Change-Id: Ibfe0808f2487e5400ba99fe3e14e3b7af749cbbe

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index c6f69fb..7d60431 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -17,21 +17,24 @@
     <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/lib/android.hardware.tests.msgq@1.0.so->/system/lib/android.hardware.tests.msgq@1.0.so" />
-        <option name="push" value="DATA/lib64/android.hardware.tests.msgq@1.0.so->/system/lib64/android.hardware.tests.msgq@1.0.so" />
-        <option name="push" value="DATA/vendor/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/vendor/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>