commit 74b31cace5370c14c56029bb92a6b475f8eb7aed
author Maciej Żenczykowski <maze@google.com> Tue Jul 19 05:38:26 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Jul 19 06:19:31 2022 -0700
tree 3bff263075e6536226656b214a6dd8f18abc7bda
parent 2b21c2510b08d6cc1557dac9d440aa9fc0b1ee5c

bpf_existence_test: add a missed map and program

Test: TreeHugger, atest bpf_existence_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I41c8a3c1764c1542f0d3e68a4713d8984ef58db0

tests/mts/bpf_existence_test.cpp

diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp
index 3376c15..2613363 100644
--- a/tests/mts/bpf_existence_test.cpp
+++ b/tests/mts/bpf_existence_test.cpp
@@ -65,6 +65,7 @@
     TETHERING "map_offload_tether_stats_map",
     TETHERING "map_offload_tether_upstream4_map",
     TETHERING "map_offload_tether_upstream6_map",
+    TETHERING "map_test_bitmap",
     TETHERING "map_test_tether_downstream6_map",
     TETHERING "prog_offload_schedcls_tether_downstream4_ether",
     TETHERING "prog_offload_schedcls_tether_downstream4_rawip",
@@ -76,6 +77,11 @@
     TETHERING "prog_offload_schedcls_tether_upstream6_rawip",
 };
 
+// Provided by *current* mainline module for S+ devices with 5.10+ kernels
+static const set<string> MAINLINE_FOR_S_5_10_PLUS = {
+    TETHERING "prog_test_xdp_drop_ipv4_udp_ether",
+};
+
 // Provided by *current* mainline module for T+ devices
 static const set<string> MAINLINE_FOR_T_PLUS = {
     SHARED "map_block_blocked_ports_map",
@@ -146,6 +152,7 @@
     DO_EXPECT(IsAtLeastR() && !IsAtLeastS(), PLATFORM_ONLY_IN_R);
 
     DO_EXPECT(IsAtLeastS(), MAINLINE_FOR_S_PLUS);
+    DO_EXPECT(IsAtLeastS() && isAtLeastKernelVersion(5, 10, 0), MAINLINE_FOR_S_5_10_PLUS);
 
     // Nothing added or removed in SCv2.