aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
diff options
context:
space:
mode:
authorDmitry Torokhov <[email protected]>2023-02-21 19:19:49 +0000
committerDmitry Torokhov <[email protected]>2023-02-21 19:19:49 +0000
commit7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 (patch)
treedbdd35328f43569c38c4ce193cefd7d2b6b9fbfd /tools/testing/selftests/bpf/prog_tests/libbpf_str.c
parentInput: i8042 - add Clevo PCX0DX to i8042 quirk table (diff)
parentdt-bindings: input: iqs626a: Redefine trackpad property types (diff)
downloadkernel-7ae9fb1b7ecbb5d85d07857943f677fd1a559b18.tar.gz
kernel-7ae9fb1b7ecbb5d85d07857943f677fd1a559b18.zip
Merge branch 'next' into for-linus
Prepare input updates for 6.3 merge window.
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/libbpf_str.c')
-rw-r--r--tools/testing/selftests/bpf/prog_tests/libbpf_str.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
index 93e9cddaadcf..efb8bd43653c 100644
--- a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
+++ b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c
@@ -139,6 +139,14 @@ static void test_libbpf_bpf_map_type_str(void)
snprintf(buf, sizeof(buf), "BPF_MAP_TYPE_%s", map_type_str);
uppercase(buf);
+ /* Special case for map_type_name BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED
+ * where it and BPF_MAP_TYPE_CGROUP_STORAGE have the same enum value
+ * (map_type). For this enum value, libbpf_bpf_map_type_str() picks
+ * BPF_MAP_TYPE_CGROUP_STORAGE.
+ */
+ if (strcmp(map_type_name, "BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED") == 0)
+ continue;
+
ASSERT_STREQ(buf, map_type_name, "exp_str_value");
}