From 6273e1489ebc72fc80d71b28cb419841d8dfd9c4 Mon Sep 17 00:00:00 2001
From: Cheng-Cheng Lo <locc@google.com>
Date: Tue, 1 Oct 2024 14:29:43 +0800
Subject: [PATCH] ANDROID: install KUnit tests dependencies and enable
 regmap-kunit.

Some KUnit tests require specific kernel modules to be installed. For example, regmap-kunit depends on regmap-ram and regmap-raw-ram.

Bug: 361411967
Test: abtd
Change-Id: I6e6862492c28e5dd3466a71cca713f1c44737fcd
Signed-off-by: Cheng-Cheng Lo <locc@google.com>
---
 .../kunit/android/tradefed_configs/config_arm64.xml    | 10 +++++++---
 .../kunit/android/tradefed_configs/config_x86_64.xml   | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/testing/kunit/android/tradefed_configs/config_arm64.xml b/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
index 80f05ac73396..29e7e4f7d303 100644
--- a/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
+++ b/tools/testing/kunit/android/tradefed_configs/config_arm64.xml
@@ -11,12 +11,16 @@
         <option name="install-arg" value="enable=1" />
    </target_preparer>
 
+    <!-- KUnit tests dependencies -->
+    <target_preparer class="com.android.tradefed.targetprep.InstallKernelModulePreparer">
+        <option name='module-path' key='drivers/base/regmap/regmap-ram' value='/data/kunit/arm64/regmap-ram.ko' />
+        <option name='module-path' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/arm64/regmap-raw-ram.ko' />
+   </target_preparer>
+
     <!-- Modules that leave the OS in an unstable state have been temporarily commented out. -->
     <test class="com.android.tradefed.testtype.binary.KUnitModuleTest" >
         <option name="skip-binary-check" value="true" />
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/arm64/regmap-kunit.ko' /> -->
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-ram' value='/data/kunit/arm64/regmap-ram.ko' /> -->
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/arm64/regmap-raw-ram.ko' /> -->
+        <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/arm64/regmap-kunit.ko' />
         <option name='binary' key='drivers/hid/hid-uclogic-test' value='/data/kunit/arm64/hid-uclogic-test.ko' />
         <!-- <option name='binary' key='drivers/iio/test/iio-test-format' value='/data/kunit/arm64/iio-test-format.ko' /> -->
         <option name='binary' key='drivers/input/tests/input_test' value='/data/kunit/arm64/input_test.ko' />
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 6beabe709f10..de16a5fb84af 100644
--- a/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml
+++ b/tools/testing/kunit/android/tradefed_configs/config_x86_64.xml
@@ -11,12 +11,16 @@
         <option name="install-arg" value="enable=1" />
    </target_preparer>
 
+    <!-- KUnit tests dependencies -->
+    <target_preparer class="com.android.tradefed.targetprep.InstallKernelModulePreparer">
+        <option name='module-path' key='drivers/base/regmap/regmap-ram' value='/data/kunit/x86_64/regmap-ram.ko' />
+        <option name='module-path' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/x86_64/regmap-raw-ram.ko' />
+   </target_preparer>
+
     <!-- Modules that leave the OS in an unstable state have been temporarily commented out. -->
     <test class="com.android.tradefed.testtype.binary.KUnitModuleTest" >
         <option name="skip-binary-check" value="true" />
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/x86_64/egmap-kunit.ko' /> -->
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-ram' value='/data/kunit/x86_64/regmap-ram.ko' /> -->
-        <!-- <option name='binary' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/x86_64/regmap-raw-ram.ko' /> -->
+        <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/x86_64/regmap-kunit.ko' />
         <option name='binary' key='drivers/hid/hid-uclogic-test' value='/data/kunit/x86_64/hid-uclogic-test.ko' />
         <!-- <option name='binary' key='drivers/iio/test/iio-test-format' value='/data/kunit/x86_64/iio-test-format.ko' /> -->
         <option name='binary' key='drivers/input/tests/input_test' value='/data/kunit/x86_64/input_test.ko' />