From df94db3ddab1d31573d2b7df4cd17fe9cb2825b1 Mon Sep 17 00:00:00 2001
From: Joe Fradley <joefradley@google.com>
Date: Mon, 20 Nov 2023 08:44:17 -0800
Subject: [PATCH] ANDROID: Add packaging rules for KUnit test modules.

Include KUnit modules and test configuration inside `tests.zip` alongside the kselftest tests.

Bug: 311187098
Change-Id: Ic82cd8611d0761435a45c8e82c7d10a009d01a73
Signed-off-by: Joe Fradley <joefradley@google.com>
---
 BUILD.bazel                                   | 72 +++++++++++++++++--
 tools/testing/kunit/android/config_arm64.xml  | 33 +++++++++
 tools/testing/kunit/android/config_x86_64.xml | 30 ++++++++
 3 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 tools/testing/kunit/android/config_arm64.xml
 create mode 100644 tools/testing/kunit/android/config_x86_64.xml

diff --git a/BUILD.bazel b/BUILD.bazel
index 8c3b0e0f111c..3dcf3b1ffe5b 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2021 The Android Open Source Project
 
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
@@ -607,6 +608,12 @@ _KUNIT_CLK_MODULES = [
     "drivers/clk/clk_test.ko",
 ]
 
+_KUNIT_X86_64_MODULES = _KUNIT_COMMON_MODULES
+
+_KUNIT_ARM64_MODULES = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES
+
+_KUNIT_RISCV64_MODULES = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES
+
 kernel_build(
     name = "kunit_aarch64",
     srcs = [":kernel_aarch64_sources"],
@@ -619,7 +626,7 @@ kernel_build(
         "tools/testing/kunit/configs/android/kunit_clk_defconfig",
     ],
     make_goals = ["modules"],
-    module_outs = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES,
+    module_outs = _KUNIT_ARM64_MODULES,
 )
 
 copy_to_dist_dir(
@@ -642,7 +649,7 @@ kernel_build(
         # x86_64 does not set CONFIG_COMMON_CLK
     ],
     make_goals = ["modules"],
-    module_outs = _KUNIT_COMMON_MODULES,
+    module_outs = _KUNIT_X86_64_MODULES,
 )
 
 copy_to_dist_dir(
@@ -665,7 +672,7 @@ kernel_build(
         "tools/testing/kunit/configs/android/kunit_clk_defconfig",
     ],
     make_goals = ["modules"],
-    module_outs = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES,
+    module_outs = _KUNIT_RISCV64_MODULES,
 )
 
 copy_to_dist_dir(
@@ -676,6 +683,55 @@ copy_to_dist_dir(
     log = "info",
 )
 
+_KUNIT_DIR = "testcases/kunit"
+
+[
+    copy_file(
+        name = "_x86_64_{}_copy".format(m),
+        src = ":kunit_x86_64/{}".format(m),
+        out = paths.join(_KUNIT_DIR, "x86_64", m),
+        visibility = ["//visibility:private"],
+    )
+    for m in _KUNIT_X86_64_MODULES
+]
+
+[
+    copy_file(
+        name = "_arm64_{}_copy".format(m),
+        src = ":kunit_aarch64/{}".format(m),
+        out = paths.join(_KUNIT_DIR, "arm64", m),
+        visibility = ["//visibility:private"],
+    )
+    for m in _KUNIT_ARM64_MODULES
+]
+
+copy_file(
+    name = "kunit_gen_config",
+    src = select(
+        {
+            ":x86_64": "tools/testing/kunit/android/config_x86_64.xml",
+            ":arm64": "tools/testing/kunit/android/config_arm64.xml",
+        },
+        no_match_error = "Unsupported arch for kunit_gen_config",
+    ),
+    out = paths.join(_KUNIT_DIR, "kunit.config"),
+    visibility = ["//visibility:private"],
+)
+
+android_filegroup(
+    name = "kunit_tests_x86_64",
+    srcs = [":kunit_gen_config"] + [":_x86_64_{}_copy".format(m) for m in _KUNIT_X86_64_MODULES],
+    cpu = "x86_64",
+    visibility = ["//visibility:private"],
+)
+
+android_filegroup(
+    name = "kunit_tests_arm64",
+    srcs = [":kunit_gen_config"] + [":_arm64_{}_copy".format(m) for m in _KUNIT_ARM64_MODULES],
+    cpu = "arm64",
+    visibility = ["//visibility:private"],
+)
+
 # DDK Headers
 # All headers. These are the public targets for DDK modules to use.
 alias(
@@ -1059,12 +1115,18 @@ android_filegroup(
 
 zip_archive(
     name = "tests_zip_x86_64",
-    srcs = [":kselftest_tests_x86_64"],
+    srcs = [
+        ":kselftest_tests_x86_64",
+        ":kunit_tests_x86_64",
+    ],
     out = "tests.zip",
 )
 
 zip_archive(
     name = "tests_zip_arm64",
-    srcs = [":kselftest_tests_arm64"],
+    srcs = [
+        ":kselftest_tests_arm64",
+        ":kunit_tests_arm64",
+    ],
     out = "tests.zip",
 )
diff --git a/tools/testing/kunit/android/config_arm64.xml b/tools/testing/kunit/android/config_arm64.xml
new file mode 100644
index 000000000000..262ad300fb6f
--- /dev/null
+++ b/tools/testing/kunit/android/config_arm64.xml
@@ -0,0 +1,33 @@
+<configuration description="kunit">
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push-file" key="kunit" value="/data/kunit" />
+    </target_preparer>
+
+    <result_reporter class="com.android.tradefed.result.ConsoleResultReporter" />
+
+    <!-- Modules that leave the OS in an unstable state have been temporarily commented out. -->
+    <test class="com.android.tradefed.testtype.binary.KUnitModuleTest" >
+        <!-- <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/arm64/drivers/base/regmap/regmap-kunit.ko' /> -->
+        <option name='binary' key='drivers/base/regmap/regmap-ram' value='/data/kunit/arm64/drivers/base/regmap/regmap-ram.ko' />
+        <option name='binary' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/arm64/drivers/base/regmap/regmap-raw-ram.ko' />
+        <option name='binary' key='drivers/hid/hid-uclogic-test' value='/data/kunit/arm64/drivers/hid/hid-uclogic-test.ko' />
+        <!-- <option name='binary' key='drivers/iio/test/iio-test-format' value='/data/kunit/arm64/drivers/iio/test/iio-test-format.ko' /> -->
+        <option name='binary' key='drivers/input/tests/input_test' value='/data/kunit/arm64/drivers/input/tests/input_test.ko' />
+        <option name='binary' key='drivers/rtc/lib_test' value='/data/kunit/arm64/drivers/rtc/lib_test.ko' />
+        <option name='binary' key='fs/ext4/ext4-inode-test' value='/data/kunit/arm64/fs/ext4/ext4-inode-test.ko' />
+        <option name='binary' key='fs/fat/fat_test' value='/data/kunit/arm64/fs/fat/fat_test.ko' />
+        <option name='binary' key='kernel/time/time_test' value='/data/kunit/arm64/kernel/time/time_test.ko' />
+        <option name='binary' key='lib/kunit/kunit-example-test' value='/data/kunit/arm64/lib/kunit/kunit-example-test.ko' />
+        <!-- <option name='binary' key='lib/kunit/kunit-test' value='/data/kunit/arm64/lib/kunit/kunit-test.ko' /> -->
+        <!-- <option name='binary' key='mm/kfence/kfence_test' value='/data/kunit/arm64/mm/kfence/kfence_test.ko' /> -->
+        <option name='binary' key='net/core/dev_addr_lists_test' value='/data/kunit/arm64/net/core/dev_addr_lists_test.ko' />
+        <!-- <option name='binary' key='sound/soc/soc-topology-test' value='/data/kunit/arm64/sound/soc/soc-topology-test.ko' /> -->
+	<option name='binary' key='sound/soc/soc-utils-test' value='/data/kunit/arm64/sound/soc/soc-utils-test.ko' />
+
+	<option name='binary' key='drivers/clk/clk-gate_test' value='/data/kunit/arm64/drivers/clk/clk-gate_test.ko' />
+        <option name='binary' key='drivers/clk/clk_test' value='/data/kunit/arm64/drivers/clk/clk_test.ko' />
+    </test>
+</configuration>
diff --git a/tools/testing/kunit/android/config_x86_64.xml b/tools/testing/kunit/android/config_x86_64.xml
new file mode 100644
index 000000000000..8bd85fe58c23
--- /dev/null
+++ b/tools/testing/kunit/android/config_x86_64.xml
@@ -0,0 +1,30 @@
+<configuration description="kunit">
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push-file" key="kunit" value="/data/kunit" />
+    </target_preparer>
+
+    <result_reporter class="com.android.tradefed.result.ConsoleResultReporter" />
+
+    <!-- Modules that leave the OS in an unstable state have been temporarily commented out. -->
+    <test class="com.android.tradefed.testtype.binary.KUnitModuleTest" >
+        <!-- <option name='binary' key='drivers/base/regmap/regmap-kunit' value='/data/kunit/x86_64/drivers/base/regmap/regmap-kunit.ko' /> -->
+        <option name='binary' key='drivers/base/regmap/regmap-ram' value='/data/kunit/x86_64/drivers/base/regmap/regmap-ram.ko' />
+        <option name='binary' key='drivers/base/regmap/regmap-raw-ram' value='/data/kunit/x86_64/drivers/base/regmap/regmap-raw-ram.ko' />
+        <option name='binary' key='drivers/hid/hid-uclogic-test' value='/data/kunit/x86_64/drivers/hid/hid-uclogic-test.ko' />
+        <!-- <option name='binary' key='drivers/iio/test/iio-test-format' value='/data/kunit/x86_64/drivers/iio/test/iio-test-format.ko' /> -->
+        <option name='binary' key='drivers/input/tests/input_test' value='/data/kunit/x86_64/drivers/input/tests/input_test.ko' />
+        <option name='binary' key='drivers/rtc/lib_test' value='/data/kunit/x86_64/drivers/rtc/lib_test.ko' />
+        <option name='binary' key='fs/ext4/ext4-inode-test' value='/data/kunit/x86_64/fs/ext4/ext4-inode-test.ko' />
+        <option name='binary' key='fs/fat/fat_test' value='/data/kunit/x86_64/fs/fat/fat_test.ko' />
+        <option name='binary' key='kernel/time/time_test' value='/data/kunit/x86_64/kernel/time/time_test.ko' />
+        <option name='binary' key='lib/kunit/kunit-example-test' value='/data/kunit/x86_64/lib/kunit/kunit-example-test.ko' />
+        <!-- <option name='binary' key='lib/kunit/kunit-test' value='/data/kunit/x86_64/lib/kunit/kunit-test.ko' /> -->
+        <!-- <option name='binary' key='mm/kfence/kfence_test' value='/data/kunit/x86_64/mm/kfence/kfence_test.ko' /> -->
+        <option name='binary' key='net/core/dev_addr_lists_test' value='/data/kunit/x86_64/net/core/dev_addr_lists_test.ko' />
+        <!-- <option name='binary' key='sound/soc/soc-topology-test' value='/data/kunit/x86_64/sound/soc/soc-topology-test.ko' /> -->
+        <option name='binary' key='sound/soc/soc-utils-test' value='/data/kunit/x86_64/sound/soc/soc-utils-test.ko' />
+    </test>
+</configuration>