summaryrefslogtreecommitdiff
path: root/simpleperf
diff options
context:
space:
mode:
authorDan Shi <dshi@google.com>2017-03-28 11:40:50 -0700
committerDan Shi <dshi@google.com>2017-03-28 12:08:13 -0700
commit222a0255a7fd780742896b2b0ca23f6ef8090497 (patch)
tree84d2bf734003a712c5d7c48cba4e956b29b8ff97 /simpleperf
parent7902acdaa01a820ee8dd70feeb4f11abb604c284 (diff)
downloadextras-222a0255a7fd780742896b2b0ca23f6ef8090497.tar.gz
Add test config to simpleperf_unit_test and simpleperf_unit_test
Design doc: Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo Details about test configs changes are tracked in doc https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit# Bug: 35882476 Test: local test Change-Id: I80a567fcb44ea00d38243fb2bdeac4798024a201
Diffstat (limited to 'simpleperf')
-rw-r--r--simpleperf/Android.mk4
-rw-r--r--simpleperf/AndroidTest.xml31
2 files changed, 35 insertions, 0 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk
index f47e08be..91723212 100644
--- a/simpleperf/Android.mk
+++ b/simpleperf/Android.mk
@@ -315,6 +315,7 @@ simpleperf_unit_test_src_files_linux := \
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_unit_test
+LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := \
$(simpleperf_unit_test_src_files) \
@@ -330,6 +331,7 @@ include $(BUILD_NATIVE_TEST)
# simpleperf_unit_test host
include $(CLEAR_VARS)
LOCAL_MODULE := simpleperf_unit_test
+LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
LOCAL_CPPFLAGS_darwin := $(simpleperf_cppflags_host_darwin)
@@ -354,6 +356,7 @@ simpleperf_cpu_hotplug_test_src_files := \
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_cpu_hotplug_test
+LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := $(simpleperf_cpu_hotplug_test_src_files)
LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_target)
@@ -366,6 +369,7 @@ include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_cpu_hotplug_test
+LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
LOCAL_CPPFLAGS_linux := $(simpleperf_cppflags_host_linux)
diff --git a/simpleperf/AndroidTest.xml b/simpleperf/AndroidTest.xml
new file mode 100644
index 00000000..310cd2a5
--- /dev/null
+++ b/simpleperf/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?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 simpleperf_unit_test and simpleperf_cpu_hotplug_test">
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+ <option name="cleanup" value="true" />
+ <option name="push" value="simpleperf_unit_test->/data/local/tmp/simpleperf_unit_test" />
+ <option name="push" value="simpleperf_cpu_hotplug_test->/data/local/tmp/simpleperf_cpu_hotplug_test" />
+ </target_preparer>
+ <option name="test-suite-tag" value="apct" />
+ <test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-device-path" value="/data/local/tmp" />
+ <option name="module-name" value="simpleperf_unit_test" />
+ </test>
+ <test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-device-path" value="/data/local/tmp" />
+ <option name="module-name" value="simpleperf_cpu_hotplug_test" />
+ </test>
+</configuration>