Add TEST_MAPPING for architecture-dependent cpu_features tests.
Introduce a new `cpu_features-cpuinfo_test` test module with
arch-specific build rules and add it to TEST_MAPPING.
Test: atest --test-mapping external/cpu_features:presubmit
Bug: 122712425
Change-Id: I18a5815ccc14d065d48c6b8bb7cd4c0593e38197
diff --git a/Android.bp b/Android.bp
index e99c646..5420f40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -266,7 +266,6 @@
cc_defaults {
name: "cpu_features-cpuinfo-test-defaults",
defaults: ["cpu_features-test-defaults"],
- enabled: false,
static_libs: [
"libcpu_features-all_libraries",
],
@@ -275,6 +274,7 @@
cc_test {
name: "cpu_features-cpuinfo_x86_test",
defaults: ["cpu_features-cpuinfo-test-defaults"],
+ enabled: false,
arch: {
x86: {
enabled: true,
@@ -304,6 +304,7 @@
"cpu_features-cpuinfo-test-defaults",
"stack_line_reader-defaults",
],
+ enabled: false,
arch: {
arm: {
enabled: true,
@@ -317,6 +318,7 @@
cc_test {
name: "cpu_features-cpuinfo_aarch64_test",
+ enabled: false,
defaults: [
"cpu_features-cpuinfo-test-defaults",
"stack_line_reader-defaults",
@@ -334,3 +336,51 @@
"src/cpuinfo_aarch64.c",
],
}
+
+cc_test {
+ name: "cpu_features-cpuinfo_test",
+ defaults: [
+ "cpu_features-cpuinfo-test-defaults"
+ ],
+ arch: {
+ x86: {
+ cflags: [
+ "-DCPU_FEATURES_MOCK_CPUID_X86",
+ "-Wno-unused-variable",
+ ],
+ srcs: [
+ "test/cpuinfo_x86_test.cc",
+ "src/cpuinfo_x86.c",
+ ],
+ },
+ x86_64: {
+ cflags: [
+ "-DCPU_FEATURES_MOCK_CPUID_X86",
+ "-Wno-unused-variable",
+ ],
+ srcs: [
+ "test/cpuinfo_x86_test.cc",
+ "src/cpuinfo_x86.c",
+ ],
+ },
+ arm: {
+ cflags: [
+ "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+ ],
+ srcs: [
+ "test/cpuinfo_arm_test.cc",
+ "src/cpuinfo_arm.c",
+ ],
+ },
+ arm64: {
+ cflags: [
+ "-DSTACK_LINE_READER_BUFFER_SIZE=1024",
+ "-Wno-gnu-designator",
+ ],
+ srcs: [
+ "test/cpuinfo_aarch64_test.cc",
+ "src/cpuinfo_aarch64.c",
+ ],
+ }
+ },
+}
