diff options
Diffstat (limited to 'hwbinder_benchmark')
5 files changed, 9 insertions, 12 deletions
diff --git a/hwbinder_benchmark/HwBinderPerformanceTest.py b/hwbinder_benchmark/HwBinderPerformanceTest.py index c72f634..4fc0842 100644 --- a/hwbinder_benchmark/HwBinderPerformanceTest.py +++ b/hwbinder_benchmark/HwBinderPerformanceTest.py @@ -115,6 +115,7 @@ class HwBinderPerformanceTest(base_test.BaseTestClass): results = self.dut.shell.one.Execute([ "chmod 755 %s" % binary, + "VTS_ROOT_PATH=/data/local/tmp " \ "LD_LIBRARY_PATH=/system/lib%s:/data/local/tmp/%s/hw:" "/data/local/tmp/%s:$LD_LIBRARY_PATH " "%s -m %s --benchmark_format=json" % diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml index f0c29cd..98b17e7 100644 --- a/hwbinder_benchmark/binderize/AndroidTest.xml +++ b/hwbinder_benchmark/binderize/AndroidTest.xml @@ -18,13 +18,12 @@ <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/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" /> - <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> - <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> </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 8446064..5445b34 100644 --- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml @@ -18,13 +18,12 @@ <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/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" /> - <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> - <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> </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 17271e3..b830778 100644 --- a/hwbinder_benchmark/passthrough/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough/AndroidTest.xml @@ -18,13 +18,12 @@ <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/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" /> - <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> - <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> </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 b38d566..d2c1696 100644 --- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml @@ -18,13 +18,12 @@ <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/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/32/android.hardware.tests.libhwbinder@1.0.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libhwbinder@1.0.so->/data/local/tmp/64/android.hardware.tests.libhwbinder@1.0.so" /> - <option name="push" value="DATA/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> - <option name="push" value="DATA/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/vendor/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> + <option name="push" value="DATA/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so->/data/local/tmp/system/lib64/hw/android.hardware.tests.libhwbinder@1.0-impl.so" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> </target_preparer> |