Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I5c0b415e67a01707f502948887460ab92a230766
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 @@
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/audio_loopback_test/AudioLoopbackTest.py b/audio_loopback_test/AudioLoopbackTest.py
index 10c1b51..358a774 100644
--- a/audio_loopback_test/AudioLoopbackTest.py
+++ b/audio_loopback_test/AudioLoopbackTest.py
@@ -41,8 +41,7 @@
ITERATION = 100
def setUpClass(self):
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
+ self.dut = self.android_devices[0]
self.dut.adb.shell("mkdir -p %s" % self.FULL_DATA_DIR_PATH)
# install Loopback.apk
self.dut.adb.shell("pm install -r -g /data/local/tmp/Loopback.apk")
@@ -96,23 +95,23 @@
latencies = []
confidences = []
for i in range(0, self.ITERATION):
- self.dut.shell.one.Execute(
+ self.dut.shell.Execute(
["rm -f %s/*" % self.FULL_DATA_DIR_PATH])
- self.dut.shell.one.Execute([
+ self.dut.shell.Execute([
"am start -n org.drrickorang.loopback/.LoopbackActivity "
"--es FileName %s/%s --ei AudioLevel 11 --ei TestType 222;" %
(self.TEST_DATA_DIR, self.TEST_FILE_PREFIX)
])
# wait until the test finished.
- results = self.dut.shell.one.Execute(
+ results = self.dut.shell.Execute(
["ls %s" % self.TEST_FILE_NAME])
while results[const.EXIT_CODE][0]:
logging.info("Test is running...")
sleep(1)
- results = self.dut.shell.one.Execute(
+ results = self.dut.shell.Execute(
["ls %s" % self.TEST_FILE_NAME])
- results = self.dut.shell.one.Execute(
+ results = self.dut.shell.Execute(
["cat %s" % self.TEST_FILE_NAME])
asserts.assertFalse(results[const.EXIT_CODE][0],
"Fail to get the test output")
diff --git a/binder_benchmark/BinderPerformanceTest.py b/binder_benchmark/BinderPerformanceTest.py
index 8003512..638aa16 100644
--- a/binder_benchmark/BinderPerformanceTest.py
+++ b/binder_benchmark/BinderPerformanceTest.py
@@ -72,10 +72,9 @@
}
def setUpClass(self):
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("stop")
- self.dut.shell.one.Execute("setprop sys.boot_completed 0")
+ self.dut = self.android_devices[0]
+ self.dut.shell.Execute("stop")
+ self.dut.shell.Execute("setprop sys.boot_completed 0")
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -87,7 +86,7 @@
def tearDownClass(self):
self._cpu_freq.EnableCpuScaling()
- self.dut.shell.one.Execute("start")
+ self.dut.shell.Execute("start")
self.dut.waitForBootCompletion()
def testRunBenchmark32Bit(self):
@@ -109,7 +108,7 @@
logging.info("Start to run the benchmark (%s bit mode)", bits)
binary = "/data/local/tmp/%s/libbinder_benchmark%s" % (bits, bits)
- results = self.dut.shell.one.Execute([
+ results = self.dut.shell.Execute([
"chmod 755 %s" % binary, "LD_LIBRARY_PATH=/data/local/tmp/%s/hw:"
"/data/local/tmp/%s:$LD_LIBRARY_PATH "
"%s --benchmark_format=json" % (bits, bits, binary)
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 @@
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 @@
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/BinderThroughputBenchmark.py b/binder_throughput_test/BinderThroughputBenchmark.py
index 8402613..3afee54 100644
--- a/binder_throughput_test/BinderThroughputBenchmark.py
+++ b/binder_throughput_test/BinderThroughputBenchmark.py
@@ -39,8 +39,7 @@
"""A test case for the binder throughput benchmarking."""
def setUpClass(self):
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
+ self.dut = self.android_devices[0]
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -150,7 +149,7 @@
logging.info("Start to run the benchmark (%s bit mode)", bits)
binary = "/data/local/tmp/%s/binderThroughputTest%s" % (bits, bits)
- results = self.dut.shell.one.Execute(
+ results = self.dut.shell.Execute(
["chmod 755 %s" % binary,
"LD_LIBRARY_PATH=/data/local/tmp/%s/hw:"
"/data/local/tmp/%s:"
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 @@
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 @@
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 $(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/fmq_benchmark/FmqPerformanceTest.py b/fmq_benchmark/FmqPerformanceTest.py
index d8032f1..9c86942 100644
--- a/fmq_benchmark/FmqPerformanceTest.py
+++ b/fmq_benchmark/FmqPerformanceTest.py
@@ -49,8 +49,7 @@
}
def setUpClass(self):
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
+ self.dut = self.android_devices[0]
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(
self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -82,7 +81,7 @@
# Start the benchmark service.
logging.info("Start the benchmark service(%s bit mode)", bits)
binary = "/data/local/tmp/%s/mq_benchmark_service%s" % (bits, bits)
- results = self.dut.shell.one.Execute([
+ results = self.dut.shell.Execute([
"chmod 755 %s" % binary,
"VTS_ROOT_PATH=/data/local/tmp TREBLE_TESTING_OVERRIDE=true " \
"LD_LIBRARY_PATH=/data/local/tmp/%s:"
@@ -97,14 +96,14 @@
logging.info("Start to run the benchmark (%s bit mode)", bits)
binary = "/data/local/tmp/%s/mq_benchmark_client%s" % (bits, bits)
- results = self.dut.shell.one.Execute([
+ results = self.dut.shell.Execute([
"chmod 755 %s" % binary,
"TREBLE_TESTING_OVERRIDE=true LD_LIBRARY_PATH=/data/local/tmp/%s:"
"$LD_LIBRARY_PATH %s" % (bits, binary)
])
# Stop the benchmark service.
- self.dut.shell.one.Execute("kill -9 `pidof mq_benchmark_service%s`" %
+ self.dut.shell.Execute("kill -9 `pidof mq_benchmark_service%s`" %
bits)
# Parses the result.
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/HwBinderPerformanceTest.py b/hwbinder_benchmark/HwBinderPerformanceTest.py
index 4fc0842..3fa5f9f 100644
--- a/hwbinder_benchmark/HwBinderPerformanceTest.py
+++ b/hwbinder_benchmark/HwBinderPerformanceTest.py
@@ -74,10 +74,9 @@
def setUpClass(self):
required_params = ["hidl_hal_mode"]
self.getUserParams(required_params)
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("stop")
- self.dut.shell.one.Execute("setprop sys.boot_completed 0")
+ self.dut = self.android_devices[0]
+ self.dut.shell.Execute("stop")
+ self.dut.shell.Execute("setprop sys.boot_completed 0")
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -89,7 +88,7 @@
def tearDownClass(self):
self._cpu_freq.EnableCpuScaling()
- self.dut.shell.one.Execute("start")
+ self.dut.shell.Execute("start")
self.dut.waitForBootCompletion()
def testRunBenchmark32Bit(self):
@@ -113,7 +112,7 @@
self.hidl_hal_mode, bits)
binary = "/data/local/tmp/%s/libhwbinder_benchmark%s" % (bits, bits)
- results = self.dut.shell.one.Execute([
+ results = self.dut.shell.Execute([
"chmod 755 %s" % binary,
"VTS_ROOT_PATH=/data/local/tmp " \
"LD_LIBRARY_PATH=/system/lib%s:/data/local/tmp/%s/hw:"
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 @@
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 @@
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 @@
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 @@
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/HwBinderLatencyTest.py b/hwbinder_latency_test/HwBinderLatencyTest.py
index 0cb2f0b..953d2cd 100644
--- a/hwbinder_latency_test/HwBinderLatencyTest.py
+++ b/hwbinder_latency_test/HwBinderLatencyTest.py
@@ -63,8 +63,7 @@
def setUpClass(self):
required_params = ["hidl_hal_mode"]
self.getUserParams(required_params)
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
+ self.dut = self.android_devices[0]
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -102,7 +101,7 @@
binary = "/data/local/tmp/%s/libhwbinder_latency%s" % (bits, bits)
min_cpu, max_cpu = self._cpu_freq.GetMinAndMaxCpuNo()
iterations = 1000 // (max_cpu - min_cpu)
- results = self.dut.shell.one.Execute([
+ results = self.dut.shell.Execute([
"chmod 755 %s" % binary,
"VTS_ROOT_PATH=/data/local/tmp " \
"LD_LIBRARY_PATH=/system/lib%s:/data/local/tmp/%s/hw:"
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 @@
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 @@
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 @@
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 @@
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/HwBinderThroughputBenchmark.py b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
index 588c37f..5fd950e 100644
--- a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
+++ b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
@@ -41,8 +41,7 @@
def setUpClass(self):
required_params = ["hidl_hal_mode"]
self.getUserParams(required_params)
- self.dut = self.registerController(android_device)[0]
- self.dut.shell.InvokeTerminal("one")
+ self.dut = self.android_devices[0]
self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut)
self._cpu_freq.DisableCpuScaling()
@@ -153,7 +152,7 @@
self.hidl_hal_mode, bits)
binary = "/data/local/tmp/%s/hwbinderThroughputTest%s" % (bits, bits)
- results = self.dut.shell.one.Execute(
+ results = self.dut.shell.Execute(
["chmod 755 %s" % binary,
"VTS_ROOT_PATH=/data/local/tmp " \
"LD_LIBRARY_PATH=/system/lib%s:/data/local/tmp/%s/hw:"
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 @@
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 @@
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 @@
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 @@
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
