diff --git a/BUILD.bazel b/BUILD.bazel
index 3dcf3b1ffe5b..8c3b0e0f111c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,7 +1,6 @@
# 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")
@@ -608,12 +607,6 @@ _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"],
@@ -626,7 +619,7 @@ kernel_build(
"tools/testing/kunit/configs/android/kunit_clk_defconfig",
],
make_goals = ["modules"],
- module_outs = _KUNIT_ARM64_MODULES,
+ module_outs = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES,
)
copy_to_dist_dir(
@@ -649,7 +642,7 @@ kernel_build(
# x86_64 does not set CONFIG_COMMON_CLK
],
make_goals = ["modules"],
- module_outs = _KUNIT_X86_64_MODULES,
+ module_outs = _KUNIT_COMMON_MODULES,
)
copy_to_dist_dir(
@@ -672,7 +665,7 @@ kernel_build(
"tools/testing/kunit/configs/android/kunit_clk_defconfig",
],
make_goals = ["modules"],
- module_outs = _KUNIT_RISCV64_MODULES,
+ module_outs = _KUNIT_COMMON_MODULES + _KUNIT_CLK_MODULES,
)
copy_to_dist_dir(
@@ -683,55 +676,6 @@ 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(
@@ -1115,18 +1059,12 @@ android_filegroup(
zip_archive(
name = "tests_zip_x86_64",
- srcs = [
- ":kselftest_tests_x86_64",
- ":kunit_tests_x86_64",
- ],
+ srcs = [":kselftest_tests_x86_64"],
out = "tests.zip",
)
zip_archive(
name = "tests_zip_arm64",
- srcs = [
- ":kselftest_tests_arm64",
- ":kunit_tests_arm64",
- ],
+ srcs = [":kselftest_tests_arm64"],
out = "tests.zip",
)
diff --git a/tools/testing/kunit/android/config_arm64.xml b/tools/testing/kunit/android/config_arm64.xml
deleted file mode 100644
index 262ad300fb6f..000000000000
--- a/tools/testing/kunit/android/config_arm64.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/testing/kunit/android/config_x86_64.xml b/tools/testing/kunit/android/config_x86_64.xml
deleted file mode 100644
index 8bd85fe58c23..000000000000
--- a/tools/testing/kunit/android/config_x86_64.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-