From 6c455c44f0ac22ab9f237ee520d0dad4ad1bda1e Mon Sep 17 00:00:00 2001
From: Hsin-Yi Chen <hsinyichen@google.com>
Date: Fri, 25 Oct 2024 12:10:08 +0800
Subject: [PATCH] ANDROID: Check arch before running kunit

KUnit configurations include KernelTestModuleController that skips the
tests for mismatching architectures.

Test: ./run_test_only.sh --gcov -s 0.0.0.0:6520 -t \
      'kunit soc-utils-test#soc-utils'
Bug: 358439710
Change-Id: I5b1daee4329c9b9cf1d534d0ea88b41d76cfa7bc
Signed-off-by: Hsin-Yi Chen <hsinyichen@google.com>
---
 tools/testing/kunit/android/tradefed_configs/config_arm64.xml | 4 ++++
 .../testing/kunit/android/tradefed_configs/config_x86_64.xml  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tools/testing/kunit/android/tradefed_configs/config_arm64.xml b/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
index 29e7e4f7d303..aa7a14d98e42 100644
--- a/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
+++ b/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
@@ -1,4 +1,8 @@
 <configuration description="kunit">
+    <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.RootTargetPreparer"/>
 
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
diff --git a/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml b/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml
index de16a5fb84af..ada53eb94012 100644
--- a/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml
+++ b/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml
@@ -1,4 +1,8 @@
 <configuration description="kunit">
+    <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.RootTargetPreparer"/>
 
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">