From ef3a3d71a8c1ad9f4a25035599f4e5ddeabd59d5 Mon Sep 17 00:00:00 2001
From: Edward Liaw <edliaw@google.com>
Date: Wed, 3 Jan 2024 18:29:30 +0000
Subject: [PATCH] ANDROID: Specify arch for kselftest test suites

Tradefed will run tests against all abis by default.  The kselftest
suite is built per architecture so it needs to only run when the abi
matches the build.

Bug: 310227391
Bug: 318413396
Change-Id: I55a7f5cea2b3970dea06cb0a2f68d6c9ed865887
Signed-off-by: Edward Liaw <edliaw@google.com>
---
 tools/testing/selftests/android/config_arm64.xml  | 4 ++++
 tools/testing/selftests/android/config_x86_64.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/selftests/android/config_arm64.xml
index 5f675ab6d5bb..ca95d4dddeda 100644
--- a/tools/testing/selftests/android/config_arm64.xml
+++ b/tools/testing/selftests/android/config_arm64.xml
@@ -10,6 +10,10 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
     <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" />
 
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" >
+        <option name="arch" value="arm64"/>
+    </object>
+
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="selftests" value="/data/selftests" />
diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml
index 36975f376cc8..0e9ca3f737e1 100644
--- a/tools/testing/selftests/android/config_x86_64.xml
+++ b/tools/testing/selftests/android/config_x86_64.xml
@@ -10,6 +10,10 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
     <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" />
 
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" >
+        <option name="arch" value="x86_64"/>
+    </object>
+
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="selftests" value="/data/selftests" />