Merge "Add pre-upload style checker for cpp and java code"
diff --git a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
index 8f6e0a6..ddbbda5 100644
--- a/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libbinder performance benchmarks with systrace">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark32->/data/local/tmp/32/libbinder_benchmark32" />
diff --git a/binder_benchmark/binder_performance_test/AndroidTest.xml b/binder_benchmark/binder_performance_test/AndroidTest.xml
index c0993ac..342a7c6 100644
--- a/binder_benchmark/binder_performance_test/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_test/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libbinder_benchmark/libbinder_benchmark32->/data/local/tmp/32/libbinder_benchmark32" />
diff --git a/binder_throughput_test/BinderThroughputBenchmark.py b/binder_throughput_test/BinderThroughputBenchmark.py
index 5588f0c..8402613 100644
--- a/binder_throughput_test/BinderThroughputBenchmark.py
+++ b/binder_throughput_test/BinderThroughputBenchmark.py
@@ -26,7 +26,7 @@
from vts.utils.python.cpu import cpu_frequency_scaling
# number of threads to use when running the throughput tests on target.
-_THREAD_LIST = [2, 3, 4, 5, 7, 10, 100]
+_THREAD_LIST = [2, 3, 4, 5, 7, 10, 30, 50, 70, 100, 200]
_ITERATIONS_PER_SECOND = "iterations_per_second"
_TIME_AVERAGE = "time_average"
diff --git a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
index 6fa3084..7555236 100644
--- a/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS BinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" />
diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
index 377b883..ee08e0c 100644
--- a/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS BinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/binderThroughputTest/binderThroughputTest->/data/local/tmp/32/binderThroughputTest32" />
diff --git a/fmq_benchmark/AndroidTest.xml b/fmq_benchmark/AndroidTest.xml
index bc435fd..eccead2 100644
--- a/fmq_benchmark/AndroidTest.xml
+++ b/fmq_benchmark/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS fmq performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/android.hardware.tests.msgq@1.0-service-benchmark/android.hardware.tests.msgq@1.0-service-benchmark->/data/local/tmp/32/mq_benchmark_service32" />
diff --git a/hwbinder_benchmark/binderize/AndroidTest.xml b/hwbinder_benchmark/binderize/AndroidTest.xml
index 5c6859b..896cf30 100644
--- a/hwbinder_benchmark/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
index bc0f415..b3ab9b0 100644
--- a/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/binderize_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_benchmark/passthrough/AndroidTest.xml b/hwbinder_benchmark/passthrough/AndroidTest.xml
index 5924ddc..acb8508 100644
--- a/hwbinder_benchmark/passthrough/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
index 9113549..9e3e6be 100644
--- a/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark/passthrough_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_benchmark_adb/binderize/AndroidTest.xml b/hwbinder_benchmark_adb/binderize/AndroidTest.xml
index 5bcbfda..809b160 100644
--- a/hwbinder_benchmark_adb/binderize/AndroidTest.xml
+++ b/hwbinder_benchmark_adb/binderize/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml b/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
index ffd07ba..6d51cf5 100644
--- a/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_benchmark_adb/binderize_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS libhwbinder performance benchmarks">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/benchmarktest/libhwbinder_benchmark/libhwbinder_benchmark32->/data/local/tmp/32/libhwbinder_benchmark32" />
diff --git a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
index ffdf96c..8d29d1c 100644
--- a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
+++ b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
@@ -26,7 +26,7 @@
from vts.utils.python.cpu import cpu_frequency_scaling
# number of threads to use when running the throughput tests on target.
-_THREAD_LIST = [2, 3, 4, 5, 7, 10, 100]
+_THREAD_LIST = [2, 3, 4, 5, 7, 10, 30, 50, 70, 100, 200]
_ITERATIONS_PER_SECOND = "iterations_per_second"
_TIME_AVERAGE = "time_average"
diff --git a/hwbinder_throughput_test/binderize/AndroidTest.xml b/hwbinder_throughput_test/binderize/AndroidTest.xml
index 701a4d7..eea81b6 100644
--- a/hwbinder_throughput_test/binderize/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
diff --git a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
index 7789eb4..4532443 100644
--- a/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/binderize_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
diff --git a/hwbinder_throughput_test/passthrough/AndroidTest.xml b/hwbinder_throughput_test/passthrough/AndroidTest.xml
index 37f7adf..7369da4 100644
--- a/hwbinder_throughput_test/passthrough/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
diff --git a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
index 692218f..0a14c8a 100644
--- a/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
+++ b/hwbinder_throughput_test/passthrough_systrace/AndroidTest.xml
@@ -15,6 +15,7 @@
-->
<configuration description="Config for VTS HwBinderThroughputBenchmark test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false" />
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
<option name="push" value="DATA/nativetest/hwbinderThroughputTest/hwbinderThroughputTest->/data/local/tmp/32/hwbinderThroughputTest32" />
