Revert "ANDROID: Add packaging rules for KUnit test modules."
This reverts commit df94db3dda.
Reason for revert:
kernel_virt_debug_* build breakage
Change-Id: I5e7fe4225159e1292532b7930e8da7e2d2f413f3
Signed-off-by: Joe Fradley <joefradley@google.com>
This commit is contained in:
Joe Fradley
+5
-67
@@ -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",
|
||||
)
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
<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>
|
||||
@@ -1,30 +0,0 @@
|
||||
<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>
|
||||
Reference in New Issue
Block a user