commit d300f556e9989d3ce864300c845154f1e612f1cd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 14 20:08:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 14 20:08:15 2017 +0000
tree b44e4ed61fb079721c3cfa2e5fbd08bf96b49f1f
parent b8ecafa6b6df978224f11c233b6bdeaef234a5bb
parent 8d9522d09c2bfaa76ec32a781a1875de7c7d2f33

Merge "Tests for configureRpcThreadpool"

test/AndroidTest.xml

diff --git a/test/AndroidTest.xml b/test/AndroidTest.xml
index b960317..d8d0338 100644
--- a/test/AndroidTest.xml
+++ b/test/AndroidTest.xml
@@ -24,10 +24,10 @@
         <option name="push" value="DATA/nativetest64/hidl_test_client/hidl_test_client->/data/nativetest64/hidl_test_client/hidl_test_client" />
         <option name="push" value="DATA/nativetest64/hidl_test_helper->/data/nativetest64/hidl_test_helper" />
         <option name="push" value="DATA/nativetest64/hidl_test->/data/nativetest64/hidl_test" />
-        <option name="push" value="vendor/lib/libfootest.so->/system/lib/libfootest.so" />
-        <option name="push" value="vendor/lib64/libfootest.so->/system/lib64/libfootest.so" />
-        <option name="push" value="vendor/lib/libpointertest.so->/system/lib/libpointertest.so" />
-        <option name="push" value="vendor/lib64/libpointertest.so->/system/lib64/libpointertest.so" />
+        <option name="push" value="DATA/vendor/lib/libfootest.so->/system/lib/libfootest.so" />
+        <option name="push" value="DATA/vendor/lib64/libfootest.so->/system/lib64/libfootest.so" />
+        <option name="push" value="DATA/vendor/lib/libpointertest.so->/system/lib/libpointertest.so" />
+        <option name="push" value="DATA/vendor/lib64/libpointertest.so->/system/lib64/libpointertest.so" />
         <option name="push" value="DATA/lib/android.hardware.tests.foo@1.0.so->/system/lib/android.hardware.tests.foo@1.0.so" />
         <option name="push" value="DATA/lib64/android.hardware.tests.foo@1.0.so->/system/lib64/android.hardware.tests.foo@1.0.so" />
         <option name="push" value="DATA/lib/android.hardware.tests.bar@1.0.so->/system/lib/android.hardware.tests.bar@1.0.so" />
@@ -42,20 +42,20 @@
         <option name="push" value="DATA/lib64/android.hardware.tests.pointer@1.0.so->/system/lib64/android.hardware.tests.pointer@1.0.so" />
         <option name="push" value="DATA/lib/android.hardware.tests.memory@1.0.so->/system/lib/android.hardware.tests.memory@1.0.so" />
         <option name="push" value="DATA/lib64/android.hardware.tests.memory@1.0.so->/system/lib64/android.hardware.tests.memory@1.0.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.foo@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.foo@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.foo@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.foo@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.bar@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.bar@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.bar@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.bar@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.baz@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.baz@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.baz@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.baz@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.hash@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.hash@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.hash@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.hash@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.inheritance@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.inheritance@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.inheritance@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.inheritance@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.pointer@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.pointer@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.pointer@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.pointer@1.0-impl.so" />
-        <option name="push" value="vendor/lib/hw/android.hardware.tests.memory@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.memory@1.0-impl.so" />
-        <option name="push" value="vendor/lib64/hw/android.hardware.tests.memory@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.memory@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.foo@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.foo@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.foo@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.foo@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.bar@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.bar@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.bar@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.bar@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.baz@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.baz@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.baz@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.baz@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.hash@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.hash@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.hash@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.hash@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.inheritance@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.inheritance@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.inheritance@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.inheritance@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.pointer@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.pointer@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.pointer@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.pointer@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.memory@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.memory@1.0-impl.so" />
+        <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.memory@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.memory@1.0-impl.so" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">