diff options
26 files changed, 0 insertions, 254 deletions
diff --git a/audio_loopback_test/Android.mk b/audio_loopback_test/Android.mk index 75eac6a..6fceefc 100644 --- a/audio_loopback_test/Android.mk +++ b/audio_loopback_test/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := AudioLoopbackTest -VTS_CONFIG_SRC_DIR := testcases/performance/audio_loopback_test -include test/vts/tools/build/Android.host_config.mk diff --git a/binder_benchmark/binder_performance_systrace_test/Android.mk b/binder_benchmark/binder_performance_systrace_test/Android.mk index c6022bd..208b015 100644 --- a/binder_benchmark/binder_performance_systrace_test/Android.mk +++ b/binder_benchmark/binder_performance_systrace_test/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := BinderPerformanceSystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/binder_benchmark/binder_performance_systrace_test include test/vts/tools/build/Android.host_config.mk diff --git a/binder_benchmark/binder_performance_test/Android.mk b/binder_benchmark/binder_performance_test/Android.mk index fc670c2..75d077b 100644 --- a/binder_benchmark/binder_performance_test/Android.mk +++ b/binder_benchmark/binder_performance_test/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := BinderPerformanceTest -VTS_CONFIG_SRC_DIR := testcases/performance/binder_benchmark/binder_performance_test include test/vts/tools/build/Android.host_config.mk diff --git a/binder_throughput_test/binder_throughput_benchmark/Android.mk b/binder_throughput_test/binder_throughput_benchmark/Android.mk index caa63ab..9c3b16a 100644 --- a/binder_throughput_test/binder_throughput_benchmark/Android.mk +++ b/binder_throughput_test/binder_throughput_benchmark/Android.mk @@ -19,5 +19,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := BinderThroughputBenchmark -VTS_CONFIG_SRC_DIR := testcases/performance/binder_throughput_test/binder_throughput_benchmark include test/vts/tools/build/Android.host_config.mk diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk b/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk index 4453ddd..4969f75 100644 --- a/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk +++ b/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk @@ -19,5 +19,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := BinderThroughputBenchmarkSystrace -VTS_CONFIG_SRC_DIR := testcases/performance/binder_throughput_test/binder_throughput_benchmark_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/fmq_benchmark/Android.mk b/fmq_benchmark/Android.mk index 6a6f2db..138443c 100644 --- a/fmq_benchmark/Android.mk +++ b/fmq_benchmark/Android.mk @@ -20,5 +20,4 @@ include $(call all-subdir-makefiles) include $(CLEAR_VARS) LOCAL_MODULE := FmqPerformanceTest -VTS_CONFIG_SRC_DIR := testcases/performance/fmq_benchmark include test/vts/tools/build/Android.host_config.mk diff --git a/hal_coverage_measurement/Android.mk b/hal_coverage_measurement/Android.mk deleted file mode 100644 index 2240148..0000000 --- a/hal_coverage_measurement/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VtsHalCoverageMeasurement -VTS_CONFIG_SRC_DIR := testcases/performance/hal_coverage_measurement --include test/vts/tools/build/Android.host_config.mk diff --git a/hal_coverage_measurement/AndroidTest.xml b/hal_coverage_measurement/AndroidTest.xml deleted file mode 100644 index d47e46a..0000000 --- a/hal_coverage_measurement/AndroidTest.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<configuration description="Config for Vts Hal Coverage Measurement test case"> - <option name="config-descriptor:metadata" key="plan" value="vts-misc" /> - <target_preparer class="com.android.tradefed.targetprep.VtsCoveragePreparer" /> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher"> - <option name="push-group" value="HalHidlHostTest.push" /> - <option name="cleanup" value="true" /> - </target_preparer> - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsHalCoverageMeasurement" /> - <option name="test-case-path" value="vts/testcases/performance/hal_coverage_measurement/VtsHalCoverageMeasurement" /> - </test> -</configuration> diff --git a/hal_coverage_measurement/VtsHalCoverageMeasurement.py b/hal_coverage_measurement/VtsHalCoverageMeasurement.py deleted file mode 100644 index 9666e2c..0000000 --- a/hal_coverage_measurement/VtsHalCoverageMeasurement.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -import logging - -from vts.runners.host import test_runner -from vts.testcases.template.cts_test import cts_test - - -class VtsHalCoverageMeasurement(cts_test.CtsTest): - """A code coverage measurement test for CTS. - - This class uses an apk which is packaged as part of VTS. It is used to measure - the code coverage of hal implementation accessed by the apk. - """ - - def setUpClass(self): - super(VtsHalCoverageMeasurement, self).setUpClass() - self.dut.start() # start the framework. - - # Initialization for coverage measurement. - if self.coverage.enabled and self.coverage.global_coverage: - self.coverage.InitializeDeviceCoverage(self.dut) - - def tearDownClass(self): - if self.coverage.enabled and self.coverage.global_coverage: - self.coverage.SetCoverageData(dut=self.dut, isGlobal=True) - super(VtsHalCoverageMeasurement, self).tearDownClass() - - def RunTestCase(self, test_case): - '''Runs a test_case. - - Args: - test_case: a cts test config. - ''' - logging.info("Installing %s", test_case["apk"]) - self.dut.adb.install(test_case["apk"]) - logging.info("Run %s", test_case["name"]) - self.dut.adb.shell("am instrument -w -r %s/%s" % (test_case["package"], - test_case["runner"])) - - logging.info("Uninstalling %s", test_case["apk"]) - self.dut.adb.uninstall(test_case["package"]) - - -if __name__ == "__main__": - test_runner.main() diff --git a/hal_coverage_measurement/__init__.py b/hal_coverage_measurement/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/hal_coverage_measurement/__init__.py +++ /dev/null diff --git a/hidl_trace_recorder/Android.mk b/hidl_trace_recorder/Android.mk deleted file mode 100644 index aee9a5c..0000000 --- a/hidl_trace_recorder/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := HidlTraceRecorder -VTS_CONFIG_SRC_DIR := testcases/performance/hidl_trace_recorder --include test/vts/tools/build/Android.host_config.mk diff --git a/hidl_trace_recorder/AndroidTest.xml b/hidl_trace_recorder/AndroidTest.xml deleted file mode 100644 index feccbce..0000000 --- a/hidl_trace_recorder/AndroidTest.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<configuration description="Config for VTS Sensor Module HIDL Trace Recoder test case"> - <option name="config-descriptor:metadata" key="plan" value="vts-misc" /> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher"> - <option name="push-group-remount-system" value="true" /> - <option name="push-group" value="RecordReplayTest.push" /> - <option name="cleanup" value="true" /> - </target_preparer> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller"> - <!-- TODO(yim): reenable when CtsSensorTestCases.apk is not flaky - <option name="test-file-name" value="DATA/app/CtsSensorTestCases/CtsSensorTestCases.apk" /> --> - <option name="test-file-name" value="CtsAccelerationTestCases.apk" /> - <option name="cleanup-apks" value="true" /> - </target_preparer> - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="HidlTraceRecorder" /> - <option name="test-case-path" value="vts/testcases/performance/hidl_trace_recorder/HidlTraceRecorder" /> - </test> -</configuration> diff --git a/hidl_trace_recorder/HidlTraceRecorder.py b/hidl_trace_recorder/HidlTraceRecorder.py deleted file mode 100644 index 9cba11a..0000000 --- a/hidl_trace_recorder/HidlTraceRecorder.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -import datetime -import logging -import os - -from vts.runners.host import asserts -from vts.runners.host import test_runner -from vts.testcases.template.cts_test import cts_test - - -class HidlTraceRecorder(cts_test.CtsTest): - """A HIDL HAL API trace recorder. - - This class uses an apk which is packaged as part of VTS. It uses to test the - VTS TF's instrumentation preparer and post-processing modules. Those two - Java TF-side modules are cherry-picked to CTS to collect HIDL traces while - running various CTS test cases without having to package them as part of - VTS. - """ - - REMOTE_PROFILINT_TRACE_PATH = "/google/data/rw/teams/android-vts/cts-traces" - - def RunTestCase(self, test_case): - '''Runs a test_case. - - Args: - test_case: a cts test config. - ''' - # before running the cts test module enable profiling. - self.profiling.EnableVTSProfiling( - self.dut.shell.one, hal_instrumentation_lib_path="") - self.dut.stop() # stop framework - self.dut.start() # start framework - - profiling_trace_path = os.path.join( - self.REMOTE_PROFILINT_TRACE_PATH, - datetime.datetime.now().strftime("%Y%m%d"), - self.GetTestName(test_case)) - if not os.path.exists(profiling_trace_path): - os.makedirs(profiling_trace_path) - - logging.info("Run %s", self.GetTestName(test_case)) - self.dut.adb.shell("am instrument -w -r %s/%s" % (test_case["package"], - test_case["runner"])) - - # after running the cts test module, copy trace files and disable profiling. - self.profiling.GetTraceFiles(self.dut, profiling_trace_path) - self.profiling.DisableVTSProfiling(self.dut.shell.one) - -if __name__ == "__main__": - test_runner.main() diff --git a/hidl_trace_recorder/__init__.py b/hidl_trace_recorder/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/hidl_trace_recorder/__init__.py +++ /dev/null diff --git a/hwbinder_benchmark/binderize/Android.mk b/hwbinder_benchmark/binderize/Android.mk index 53b0fe9..363617b 100644 --- a/hwbinder_benchmark/binderize/Android.mk +++ b/hwbinder_benchmark/binderize/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizePerformanceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark/binderize include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_benchmark/binderize_systrace/Android.mk b/hwbinder_benchmark/binderize_systrace/Android.mk index 3553d38..9b5cfc0 100644 --- a/hwbinder_benchmark/binderize_systrace/Android.mk +++ b/hwbinder_benchmark/binderize_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizePerformanceSystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark/binderize_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_benchmark/passthrough/Android.mk b/hwbinder_benchmark/passthrough/Android.mk index 3cd8185..9cee6d7 100644 --- a/hwbinder_benchmark/passthrough/Android.mk +++ b/hwbinder_benchmark/passthrough/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughPerformanceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark/passthrough include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_benchmark/passthrough_systrace/Android.mk b/hwbinder_benchmark/passthrough_systrace/Android.mk index d57ba3f..c1d5870 100644 --- a/hwbinder_benchmark/passthrough_systrace/Android.mk +++ b/hwbinder_benchmark/passthrough_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughPerformanceSystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_benchmark/passthrough_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_latency_test/binderize/Android.mk b/hwbinder_latency_test/binderize/Android.mk index 9c440a4..ffec141 100644 --- a/hwbinder_latency_test/binderize/Android.mk +++ b/hwbinder_latency_test/binderize/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizeLatencyTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_latency_test/binderize include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_latency_test/binderize_systrace/Android.mk b/hwbinder_latency_test/binderize_systrace/Android.mk index e716aa7..1e215cc 100644 --- a/hwbinder_latency_test/binderize_systrace/Android.mk +++ b/hwbinder_latency_test/binderize_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizeLatencySystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_latency_test/binderize_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_latency_test/passthrough/Android.mk b/hwbinder_latency_test/passthrough/Android.mk index 12ca61f..cc28b44 100644 --- a/hwbinder_latency_test/passthrough/Android.mk +++ b/hwbinder_latency_test/passthrough/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughLatencyTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_latency_test/passthrough include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_latency_test/passthrough_systrace/Android.mk b/hwbinder_latency_test/passthrough_systrace/Android.mk index 3a619e0..edbf9d3 100644 --- a/hwbinder_latency_test/passthrough_systrace/Android.mk +++ b/hwbinder_latency_test/passthrough_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughLatencySystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_latency_test/passthrough_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_throughput_test/binderize/Android.mk b/hwbinder_throughput_test/binderize/Android.mk index 34e12b2..8904fdc 100644 --- a/hwbinder_throughput_test/binderize/Android.mk +++ b/hwbinder_throughput_test/binderize/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizeThroughputTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_throughput_test/binderize include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_throughput_test/binderize_systrace/Android.mk b/hwbinder_throughput_test/binderize_systrace/Android.mk index a9c49da..2ea7436 100644 --- a/hwbinder_throughput_test/binderize_systrace/Android.mk +++ b/hwbinder_throughput_test/binderize_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderBinderizeThroughputSystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_throughput_test/binderize_systrace include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_throughput_test/passthrough/Android.mk b/hwbinder_throughput_test/passthrough/Android.mk index 27cca52..02fc9f8 100644 --- a/hwbinder_throughput_test/passthrough/Android.mk +++ b/hwbinder_throughput_test/passthrough/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughThroughputTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_throughput_test/passthrough include test/vts/tools/build/Android.host_config.mk diff --git a/hwbinder_throughput_test/passthrough_systrace/Android.mk b/hwbinder_throughput_test/passthrough_systrace/Android.mk index c42e68b..17d2910 100644 --- a/hwbinder_throughput_test/passthrough_systrace/Android.mk +++ b/hwbinder_throughput_test/passthrough_systrace/Android.mk @@ -18,5 +18,4 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := HwBinderPassthroughThroughputSystraceTest -VTS_CONFIG_SRC_DIR := testcases/performance/hwbinder_throughput_test/passthrough_systrace include test/vts/tools/build/Android.host_config.mk |