diff options
author | Yuexi Ma <yuexima@google.com> | 2018-03-01 21:36:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 21:36:05 +0000 |
commit | 227e7e1f702e0594d7e8263a4c9f34c91e0b3ea6 (patch) | |
tree | fdcd94ba74d0dc79eb7777f5b7544ef7df03b382 | |
parent | 56d99faf61e34d796d601153ecfb334fea854391 (diff) | |
parent | 8515cbbd2b2ad35eaa02b02cddc4b7d00fc8c41c (diff) | |
download | performance-227e7e1f702e0594d7e8263a4c9f34c91e0b3ea6.tar.gz |
remove VtsPythonVirtualenvPreparer from modules as they are now part of plan config
am: 8515cbbd2b
Change-Id: If0cec9053fb5507bc1a7f9fa63a12875f024c0fd
20 files changed, 0 insertions, 36 deletions
diff --git a/audio_loopback_test/AndroidTest.xml b/audio_loopback_test/AndroidTest.xml index 1dd35af..bb1c439 100644 --- a/audio_loopback_test/AndroidTest.xml +++ b/audio_loopback_test/AndroidTest.xml @@ -20,7 +20,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 8ad82e7..88e953e 100644 --- a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml +++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml @@ -24,8 +24,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 98e22d1..d07b600 100644 --- a/binder_benchmark/binder_performance_test/AndroidTest.xml +++ b/binder_benchmark/binder_performance_test/AndroidTest.xml @@ -24,8 +24,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 64d58f6..8fde6c7 100644 --- a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml +++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml @@ -22,8 +22,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 d4c17e4..561364f 100644 --- a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml +++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml @@ -22,8 +22,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 6f74c32..2b184ce 100644 --- a/fmq_benchmark/AndroidTest.xml +++ b/fmq_benchmark/AndroidTest.xml @@ -28,7 +28,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 81e830f..f5f477b 100644 --- a/hal_coverage_measurement/AndroidTest.xml +++ b/hal_coverage_measurement/AndroidTest.xml @@ -20,7 +20,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 512ec55..187dcae 100644 --- a/hidl_trace_recorder/AndroidTest.xml +++ b/hidl_trace_recorder/AndroidTest.xml @@ -26,7 +26,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 f29a41b..d75004d 100644 --- a/hwbinder_benchmark/binderize/AndroidTest.xml +++ b/hwbinder_benchmark/binderize/AndroidTest.xml @@ -24,8 +24,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 892ac55..5cfd9e8 100644 --- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml @@ -24,8 +24,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 bac628c..5f414e7 100644 --- a/hwbinder_benchmark/passthrough/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough/AndroidTest.xml @@ -24,8 +24,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 ac936e4..74841e3 100644 --- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml @@ -24,8 +24,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 ee67c2c..b63a2d4 100644 --- a/hwbinder_latency_test/binderize/AndroidTest.xml +++ b/hwbinder_latency_test/binderize/AndroidTest.xml @@ -24,8 +24,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 5f618b9..3fa6163 100644 --- a/hwbinder_latency_test/binderize_systrace/AndroidTest.xml +++ b/hwbinder_latency_test/binderize_systrace/AndroidTest.xml @@ -24,8 +24,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 68d793b..7ecc4eb 100644 --- a/hwbinder_latency_test/passthrough/AndroidTest.xml +++ b/hwbinder_latency_test/passthrough/AndroidTest.xml @@ -24,8 +24,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 381d7a8..56244e5 100644 --- a/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_latency_test/passthrough_systrace/AndroidTest.xml @@ -24,8 +24,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 0982a10..2bfbecd 100644 --- a/hwbinder_throughput_test/binderize/AndroidTest.xml +++ b/hwbinder_throughput_test/binderize/AndroidTest.xml @@ -24,8 +24,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 e8f84a0..265dcb6 100644 --- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml +++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml @@ -24,8 +24,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 5993c7e..bbaab79 100644 --- a/hwbinder_throughput_test/passthrough/AndroidTest.xml +++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml @@ -24,8 +24,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 24cf8f9..5afa1e3 100644 --- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml +++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml @@ -24,8 +24,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" /> |