Push FMQ test/benchmark and libhwbinder benchmark default implementation
Test: run VTS test
Bug: 36818001
Bug: 62337707
Change-Id: Ia8f81bb8ed827ac720e2c4f172a111382adca6c6
(cherry picked from commit af1c1eff164b6da856b893a491a85c18b8852124)
diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml
index eccead2..b3f5b74 100644
--- a/fmq_benchmark/AndroidTest.xml
+++ b/fmq_benchmark/AndroidTest.xml
@@ -18,12 +18,15 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
<option name="push" value="DATA/nativetest/[email protected]/[email protected]>/data/local/tmp/32/mq_benchmark_service32" />
<option name="push" value="DATA/nativetest64/[email protected]/[email protected]>/data/local/tmp/64/mq_benchmark_service64" />
<option name="push" value="DATA/nativetest/mq_benchmark_client/mq_benchmark_client->/data/local/tmp/32/mq_benchmark_client32" />
<option name="push" value="DATA/nativetest64/mq_benchmark_client/mq_benchmark_client->/data/local/tmp/64/mq_benchmark_client64" />
- <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
- <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index 896cf30..f0c29cd 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index b3ab9b0..8446064 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index acb8508..17271e3 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index 9e3e6be..b38d566 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_benchmark_adb/binderize/AndroidTest.xml b/hwbinder_benchmark_adb/binderize/AndroidTest.xml
index 809b160..3cbc8aa 100644
--- a/hwbinder_benchmark_adb/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark_adb/binderize/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
index 6d51cf5..0823007 100644
--- a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
<option name="push" value="DATA/benchmarktest64/libhwbinder_benchmark/libhwbinder_benchmark64->/data/local/tmp/64/libhwbinder_benchmark64" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index eea81b6..e2bcfed 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
<option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 4532443..79f9ae6 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
<option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index 7369da4..882e742 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
<option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index 0a14c8a..beb750c 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -18,8 +18,13 @@
<option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
+ <option name="remount-system" value="true" />
+ <option name="push" value="DATA/lib/[email protected]>/data/local/tmp/32/[email protected]" />
+ <option name="push" value="DATA/lib64/[email protected]>/data/local/tmp/64/[email protected]" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
<option name="push" value="DATA/nativetest64/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/64/hwbinderThroughputTest64" />
+ <option name="push" value="DATA/vendor/lib/hw/[email protected]>/vendor/lib/hw/[email protected]" />
+ <option name="push" value="DATA/vendor/lib64/hw/[email protected]>/vendor/lib64/hw/[email protected]" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
