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, 79 insertions, 8 deletions

diff --git a/binder_benchmark/Android.mk b/binder_benchmark/Android.mk
index 86da605..ad43994 100644
--- a/binder_benchmark/Android.mk
+++ b/binder_benchmark/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 The Android Open Source Project
+# 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.
@@ -16,9 +16,3 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := BinderPerformanceTest
-VTS_CONFIG_SRC_DIR := testcases/performance/binder_benchmark
-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
new file mode 100644
index 0000000..c6022bd
--- /dev/null
+++ b/binder_benchmark/binder_performance_systrace_test/Android.mk
@@ -0,0 +1,22 @@
+#
+# 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 := 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_systrace_test/AndroidTest.xml b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
new file mode 100644
index 0000000..8f6e0a6
--- /dev/null
+++ b/binder_benchmark/binder_performance_systrace_test/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?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 libbinder performance benchmarks with systrace">
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+        <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" />
+        <option name="push" value="DATA/benchmarktest64/libbinder_benchmark/libbinder_benchmark64->/data/local/tmp/64/libbinder_benchmark64" />
+        <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>
+    <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+    </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" />
+        <option name="enable-systrace" value="true" />
+    </test>
+</configuration>
diff --git a/binder_benchmark/binder_performance_test/Android.mk b/binder_benchmark/binder_performance_test/Android.mk
new file mode 100644
index 0000000..fc670c2
--- /dev/null
+++ b/binder_benchmark/binder_performance_test/Android.mk
@@ -0,0 +1,22 @@
+#
+# 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 := 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_benchmark/AndroidTest.xml b/binder_benchmark/binder_performance_test/AndroidTest.xml
index 82e895f..c0993ac 100644
--- a/binder_benchmark/AndroidTest.xml
+++ b/binder_benchmark/binder_performance_test/AndroidTest.xml
@@ -25,6 +25,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_benchmark/BinderPerformanceTest" />
+        <option name="test-module-name" value="BinderPerformanceTest" />
+        <option name="test-case-path" value="vts/testcases/performance/binder_benchmark/BinderPerformanceTest" />
     </test>
 </configuration>