Create performance benchmark with systrace test plan

* split test plans into regular test and test with systrace
* add missing test-module-names, correct indents

Bug: 34696301
Test: ENABLE_TREBLE=true make vts BUILD_GOOGLE_VTS=true -j32 && vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module BinderPerformanceTest -l INFO
Change-Id: I29a46336d555fcdc739637fdf5341e0dc00a4dcc
(cherry picked from commit cc9fcbb26d03c74d3574ab7c17137fc797e715ae)

5 files changed, 78 insertions, 8 deletions

diff --git a/binder_throughput_test/Android.mk b/binder_throughput_test/Android.mk
index e467d77..bfe7181 100644
--- a/binder_throughput_test/Android.mk
+++ b/binder_throughput_test/Android.mk
@@ -13,13 +13,6 @@
 # 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 := BinderThroughputBenchmark
-VTS_CONFIG_SRC_DIR := testcases/performance/binder_throughput_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
new file mode 100644
index 0000000..caa63ab
--- /dev/null
+++ b/binder_throughput_test/binder_throughput_benchmark/Android.mk
@@ -0,0 +1,23 @@
+#
+# 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 $(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/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
index ab24b89..9588f7f 100644
--- a/binder_throughput_test/AndroidTest.xml
+++ b/binder_throughput_test/binder_throughput_benchmark/AndroidTest.xml
@@ -23,6 +23,7 @@
     <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
     </target_preparer>
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-      <option name="test-case-path" value="vts/testcases/performance/binder_throughput_test/BinderThroughputBenchmark" />
+        <option name="test-module-name" value="BinderThroughputBenchmark" />
+        <option name="test-case-path" value="vts/testcases/performance/binder_throughput_test/BinderThroughputBenchmark" />
     </test>
 </configuration>
diff --git a/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk b/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk
new file mode 100644
index 0000000..4453ddd
--- /dev/null
+++ b/binder_throughput_test/binder_throughput_benchmark_systrace/Android.mk
@@ -0,0 +1,23 @@
+#
+# 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 $(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/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
new file mode 100644
index 0000000..1cf90dc
--- /dev/null
+++ b/binder_throughput_test/binder_throughput_benchmark_systrace/AndroidTest.xml
@@ -0,0 +1,30 @@
+<?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 BinderThroughputBenchmark test cases">
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <option name="push-group" value="HidlHalTest.push" />
+        <option name="cleanup" value="true" />
+        <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>
+    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+    </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" />
+        <option name="enable-systrace" value="true" />
+    </test>
+</configuration>