diff options
20 files changed, 0 insertions, 36 deletions
diff --git a/audio_loopback_test/AndroidTest.xml b/audio_loopback_test/AndroidTest.xml index 4b2900c..15c379a 100644 --- a/audio_loopback_test/AndroidTest.xml +++ b/audio_loopback_test/AndroidTest.xml @@ -19,7 +19,6 @@ <option name="cleanup" value="true" /> <option name="push" value="DATA/performance/res/Loopback.apk->/data/local/tmp/Loopback.apk" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-case-path" value="vts/testcases/performance/audio_loopback_test/AudioLoopbackTest" /> <option name="test-timeout" value="10m"/> diff --git a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml index 7a9063f..2897b9f 100644 --- a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml +++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml @@ -23,8 +23,6 @@ <option name="push" value="DATA/lib/android.hardware.tests.libbinder.so->/data/local/tmp/32/android.hardware.tests.libbinder.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libbinder.so->/data/local/tmp/64/android.hardware.tests.libbinder.so" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="BinderPerformanceSystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/binder_benchmark/BinderPerformanceTest" /> diff --git a/binder_benchmark/binder_performance_test/AndroidTest.xml b/binder_benchmark/binder_performance_test/AndroidTest.xml index 679eaa6..a949707 100644 --- a/binder_benchmark/binder_performance_test/AndroidTest.xml +++ b/binder_benchmark/binder_performance_test/AndroidTest.xml @@ -23,8 +23,6 @@ <option name="push" value="DATA/lib/android.hardware.tests.libbinder.so->/data/local/tmp/32/android.hardware.tests.libbinder.so" /> <option name="push" value="DATA/lib64/android.hardware.tests.libbinder.so->/data/local/tmp/64/android.hardware.tests.libbinder.so" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="BinderPerformanceTest" /> <option name="test-case-path" value="vts/testcases/performance/binder_benchmark/BinderPerformanceTest" /> diff --git a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml index 9183ebb..94e45ae 100644 --- a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml +++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml @@ -21,8 +21,6 @@ <option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" /> <option name="push" value="DATA/nativetest64/binderThroughputTest/binderThroughputTest->/data/local/tmp/64/binderThroughputTest64" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="BinderThroughputBenchmark" /> <option name="test-case-path" value="vts/testcases/performance/binder_throughput_test/BinderThroughputBenchmark" /> diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml index d655248..5507d5c 100644 --- a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml +++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml @@ -21,8 +21,6 @@ <option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" /> <option name="push" value="DATA/nativetest64/binderThroughputTest/binderThroughputTest->/data/local/tmp/64/binderThroughputTest64" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="BinderThroughputBenchmarkSystrace" /> <option name="test-case-path" value="vts/testcases/performance/binder_throughput_test/BinderThroughputBenchmark" /> diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml index 483f1fe..7f9944d 100644 --- a/fmq_benchmark/AndroidTest.xml +++ b/fmq_benchmark/AndroidTest.xml @@ -27,7 +27,6 @@ <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" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-case-path" value="vts/testcases/performance/fmq_benchmark/FmqPerformanceTest" /> <option name="test-timeout" value="1m"/> diff --git a/hal_coverage_measurement/AndroidTest.xml b/hal_coverage_measurement/AndroidTest.xml index e7bcee6..5f38194 100644 --- a/hal_coverage_measurement/AndroidTest.xml +++ b/hal_coverage_measurement/AndroidTest.xml @@ -19,7 +19,6 @@ <option name="push-group" value="HalHidlHostTest.push" /> <option name="cleanup" value="true" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-case-path" value="vts/testcases/performance/hal_coverage_measurement/VtsHalCoverageMeasurement" /> </test> diff --git a/hidl_trace_recorder/AndroidTest.xml b/hidl_trace_recorder/AndroidTest.xml index e9771b6..ad48b39 100644 --- a/hidl_trace_recorder/AndroidTest.xml +++ b/hidl_trace_recorder/AndroidTest.xml @@ -25,7 +25,6 @@ <option name="test-file-name" value="CtsAccelerationTestCases.apk" /> <option name="cleanup-apks" value="true" /> </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-case-path" value="vts/testcases/performance/hidl_trace_recorder/HidlTraceRecorder" /> </test> diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml index bfd178d..9e9e431 100644 --- a/hwbinder_benchmark/binderize/AndroidTest.xml +++ b/hwbinder_benchmark/binderize/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizePerformanceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" /> diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml index cc2f05d..cc54157 100644 --- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizePerformanceSystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" /> diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml index 413c1e8..ef4ed8f 100644 --- a/hwbinder_benchmark/passthrough/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughPerformanceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" /> diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml index b962159..c9a4c5b 100644 --- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughPerformanceSystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_benchmark/HwBinderPerformanceTest" /> diff --git a/hwbinder_latency_test/binderize/AndroidTest.xml b/hwbinder_latency_test/binderize/AndroidTest.xml index 8e07924..9943975 100644 --- a/hwbinder_latency_test/binderize/AndroidTest.xml +++ b/hwbinder_latency_test/binderize/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizeLatencyTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" /> diff --git a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml index d7ad27f..4bfb992 100644 --- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml +++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizeLatencySystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" /> diff --git a/hwbinder_latency_test/passthrough/AndroidTest.xml b/hwbinder_latency_test/passthrough/AndroidTest.xml index 99364df..ea3f859 100644 --- a/hwbinder_latency_test/passthrough/AndroidTest.xml +++ b/hwbinder_latency_test/passthrough/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughLatencyTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" /> diff --git a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml index 94cef5e..7f40384 100644 --- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughLatencySystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_latency_test/HwBinderLatencyTest" /> diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml index 93593bc..32c6cdc 100644 --- a/hwbinder_throughput_test/binderize/AndroidTest.xml +++ b/hwbinder_throughput_test/binderize/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizeThroughputTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" /> diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml index 0f70d53..4a1091d 100644 --- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml +++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderBinderizeThroughputSystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" /> diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml index 34079e7..1909b85 100644 --- a/hwbinder_throughput_test/passthrough/AndroidTest.xml +++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughThroughputTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" /> diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml index b9d08e5..17f160c 100644 --- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml @@ -23,8 +23,6 @@ <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="HwBinderPassthroughThroughputSystraceTest" /> <option name="test-case-path" value="vts/testcases/performance/hwbinder_throughput_test/HwBinderThroughputBenchmark" /> |