diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-30 11:49:49 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-30 11:49:49 +0000 |
commit | 3807ce65081de12ef4baa2a04487306672685160 (patch) | |
tree | 05cc5241980a6b114b77ba52f4fecd8780d42040 | |
parent | 7b20a98a85946fd07558d4c00ed4feb366e0883f (diff) | |
parent | fe65025e8484fbef793492f277230e215d759561 (diff) | |
download | common-patches-main.tar.gz |
* changes:
aosp/android-mainline: fixup Kunit tools patch into tools commit
aosp/android-mainline: update series (rebase onto v6.7)
-rw-r--r-- | android-mainline/ANDROID-tools-Miscellaneous.patch | 56 | ||||
-rw-r--r-- | android-mainline/fixup-ANDROID-Add-kunit-targets.patch | 63 | ||||
-rw-r--r-- | android-mainline/series | 5 |
3 files changed, 57 insertions, 67 deletions
diff --git a/android-mainline/ANDROID-tools-Miscellaneous.patch b/android-mainline/ANDROID-tools-Miscellaneous.patch index 6987a218..e7d0d5d8 100644 --- a/android-mainline/ANDROID-tools-Miscellaneous.patch +++ b/android-mainline/ANDROID-tools-Miscellaneous.patch @@ -9,6 +9,8 @@ Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97 tools/testing/android/OWNERS | 4 + tools/testing/android/bin/acloudb.sh | 43 +++++++++ tools/testing/android/bin/kselftest.sh | 88 +++++++++++++++++++ + .../kunit/configs/android/kunit_clk_defconfig | 3 + + .../kunit/configs/android/kunit_defconfig | 37 ++++++++ .../testing/selftests/android/config_arm.xml | 82 +++++++++++++++++ .../selftests/android/config_arm64.xml | 82 +++++++++++++++++ .../testing/selftests/android/config_x86.xml | 88 +++++++++++++++++++ @@ -19,10 +21,12 @@ Change-Id: Ic155709fbf07ec0575fa2fa954ee199e63051a97 .../futex/functional/futex_wait_wouldblock.c | 13 ++- tools/testing/selftests/net/psock_tpacket.c | 2 + tools/testing/selftests/rtc/rtctest.c | 2 + - 13 files changed, 512 insertions(+), 7 deletions(-) + 15 files changed, 552 insertions(+), 7 deletions(-) create mode 100644 tools/testing/android/OWNERS create mode 100755 tools/testing/android/bin/acloudb.sh create mode 100755 tools/testing/android/bin/kselftest.sh + create mode 100644 tools/testing/kunit/configs/android/kunit_clk_defconfig + create mode 100644 tools/testing/kunit/configs/android/kunit_defconfig create mode 100644 tools/testing/selftests/android/config_arm.xml create mode 100644 tools/testing/selftests/android/config_arm64.xml create mode 100644 tools/testing/selftests/android/config_x86.xml @@ -178,6 +182,56 @@ new file mode 100755 + echo "Test finished. Deleting cvd..." + $ACLOUD delete --instance-names $INSTANCE_NAME +fi +diff --git a/tools/testing/kunit/configs/android/kunit_clk_defconfig b/tools/testing/kunit/configs/android/kunit_clk_defconfig +new file mode 100644 +--- /dev/null ++++ b/tools/testing/kunit/configs/android/kunit_clk_defconfig +@@ -0,0 +1,3 @@ ++# Only for architectures that set CONFIG_COMMON_CLK ++CONFIG_CLK_KUNIT_TEST=m ++CONFIG_CLK_GATE_KUNIT_TEST=m +diff --git a/tools/testing/kunit/configs/android/kunit_defconfig b/tools/testing/kunit/configs/android/kunit_defconfig +new file mode 100644 +--- /dev/null ++++ b/tools/testing/kunit/configs/android/kunit_defconfig +@@ -0,0 +1,37 @@ ++# Defconfig fragment for Android Kunit targets ++# ++# Instead of setting CONFIG_KUNIT_ALL_TESTS=m, we enable individual tests ++# because: ++# - The defconfig fragment is applied after make defconfig ++# - If additional tests are added to CONFIG_KUNIT_ALL_TESTS in the future, ++# //common:kunit_* module_outs needs to be updated. ++ ++# CONFIG_MODULE_SIG_ALL is not set ++ ++# Corresponds to BUILD.bazel, _KUNIT_COMMON_MODULES ++CONFIG_TIME_KUNIT_TEST=m ++CONFIG_NETDEV_ADDR_LIST_TEST=m ++CONFIG_REGMAP_KUNIT=m ++CONFIG_INPUT_KUNIT_TEST=m ++CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m ++CONFIG_SND_SOC_UTILS_KUNIT_TEST=m ++CONFIG_HID_KUNIT_TEST=m ++CONFIG_RTC_LIB_KUNIT_TEST=m ++CONFIG_IIO_FORMAT_KUNIT_TEST=m ++CONFIG_EXT4_KUNIT_TESTS=m ++CONFIG_FAT_KUNIT_TEST=m ++CONFIG_KFENCE_KUNIT_TEST=m ++CONFIG_KUNIT_TEST=m ++CONFIG_KUNIT_EXAMPLE_TEST=m ++ ++# CONFIG_NET_HANDSHAKE is not enabled in gki_defconfig. ++# CONFIG_NET_HANDSHAKE_KUNIT_TEST=m ++ ++# TODO(b/296116800): Enable these tests ++# CONFIG_DRM_KUNIT_TEST=m ++# CONFIG_KASAN_KUNIT_TEST=m ++ ++# TODO(b/296116800): These are booleans, not tristates. ++# CONFIG_BINFMT_ELF_KUNIT_TEST=y ++# CONFIG_PM_QOS_KUNIT_TEST=y ++# CONFIG_DRIVER_PE_KUNIT_TEST=y diff --git a/tools/testing/selftests/android/config_arm.xml b/tools/testing/selftests/android/config_arm.xml new file mode 100644 --- /dev/null diff --git a/android-mainline/fixup-ANDROID-Add-kunit-targets.patch b/android-mainline/fixup-ANDROID-Add-kunit-targets.patch deleted file mode 100644 index 911762c4..00000000 --- a/android-mainline/fixup-ANDROID-Add-kunit-targets.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lee Jones <joneslee@google.com> -Date: Wed, 4 Oct 2023 16:03:27 +0100 -Subject: fixup! ANDROID: Add kunit targets. - -Change-Id: I8ec6efe84391614a84b36fef32eb8c7068a9f518 ---- - .../kunit/configs/android/kunit_clk_defconfig | 3 ++ - .../kunit/configs/android/kunit_defconfig | 37 +++++++++++++++++++ - 2 files changed, 40 insertions(+) - create mode 100644 tools/testing/kunit/configs/android/kunit_clk_defconfig - create mode 100644 tools/testing/kunit/configs/android/kunit_defconfig - -diff --git a/tools/testing/kunit/configs/android/kunit_clk_defconfig b/tools/testing/kunit/configs/android/kunit_clk_defconfig -new file mode 100644 ---- /dev/null -+++ b/tools/testing/kunit/configs/android/kunit_clk_defconfig -@@ -0,0 +1,3 @@ -+# Only for architectures that set CONFIG_COMMON_CLK -+CONFIG_CLK_KUNIT_TEST=m -+CONFIG_CLK_GATE_KUNIT_TEST=m -diff --git a/tools/testing/kunit/configs/android/kunit_defconfig b/tools/testing/kunit/configs/android/kunit_defconfig -new file mode 100644 ---- /dev/null -+++ b/tools/testing/kunit/configs/android/kunit_defconfig -@@ -0,0 +1,37 @@ -+# Defconfig fragment for Android Kunit targets -+# -+# Instead of setting CONFIG_KUNIT_ALL_TESTS=m, we enable individual tests -+# because: -+# - The defconfig fragment is applied after make defconfig -+# - If additional tests are added to CONFIG_KUNIT_ALL_TESTS in the future, -+# //common:kunit_* module_outs needs to be updated. -+ -+# CONFIG_MODULE_SIG_ALL is not set -+ -+# Corresponds to BUILD.bazel, _KUNIT_COMMON_MODULES -+CONFIG_TIME_KUNIT_TEST=m -+CONFIG_NETDEV_ADDR_LIST_TEST=m -+CONFIG_REGMAP_KUNIT=m -+CONFIG_INPUT_KUNIT_TEST=m -+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m -+CONFIG_SND_SOC_UTILS_KUNIT_TEST=m -+CONFIG_HID_KUNIT_TEST=m -+CONFIG_RTC_LIB_KUNIT_TEST=m -+CONFIG_IIO_FORMAT_KUNIT_TEST=m -+CONFIG_EXT4_KUNIT_TESTS=m -+CONFIG_FAT_KUNIT_TEST=m -+CONFIG_KFENCE_KUNIT_TEST=m -+CONFIG_KUNIT_TEST=m -+CONFIG_KUNIT_EXAMPLE_TEST=m -+ -+# CONFIG_NET_HANDSHAKE is not enabled in gki_defconfig. -+# CONFIG_NET_HANDSHAKE_KUNIT_TEST=m -+ -+# TODO(b/296116800): Enable these tests -+# CONFIG_DRM_KUNIT_TEST=m -+# CONFIG_KASAN_KUNIT_TEST=m -+ -+# TODO(b/296116800): These are booleans, not tristates. -+# CONFIG_BINFMT_ELF_KUNIT_TEST=y -+# CONFIG_PM_QOS_KUNIT_TEST=y -+# CONFIG_DRIVER_PE_KUNIT_TEST=y diff --git a/android-mainline/series b/android-mainline/series index 0287095a..25ae6522 100644 --- a/android-mainline/series +++ b/android-mainline/series @@ -1,8 +1,8 @@ # # android-mainline patches # -# Applies onto upstream 52b1853b080a0 Linux v6.7-rc8-177-g52b1853b080a0 -# Matches android-mainline 564c96e25b892 ("Merge 52b1853b080a ("Merge tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline") +# Applies onto upstream 0dd3ee3112550 Linux v6.7 +# Matches android-mainline cb4cf525e1279 ("Merge tag 'v6.7' into android-mainline") # Status: Tested # Revert-sched-core-Prevent-race-condition-between-cpuset-and-__sched_setscheduler.patch @@ -188,7 +188,6 @@ ANDROID-GKI-export-thermal_cdev_update.patch ANDROID-binder-Export-binder_transaction_received-trace-point.patch ANDROID-cpufreq-Export-cpu_frequency_limits-tracepoint.patch _____ANNOTATION-Android-kconfigs-and-build-scripts_____.patch -fixup-ANDROID-Add-kunit-targets.patch ANDROID-GKI-Android-KABI-and-Android-Vendor.patch ANDROID-GKI-enable-CONFIG_SUN4I_TIMER.patch ANDROID-GKI-Unhide-VIRTIO_DMA_SHARED_BUFFER.patch |