commit 26df963836da141ea2241b594ca73c36ba3f6ac8
author Maciej Żenczykowski <maze@google.com> Thu Jul 14 16:15:14 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 14 16:15:14 2022 +0000
tree 3d9143704a23eed6d0bb187f373c2c26dee71600
parent 50063492091fbf005c2275c078084ada80fe3fbc
parent b73da9658c705ba3eaf81895bff32177890f4391

Merge "Adjust bpf_existence_test.cpp for dscp_policy 5.15+ change"

tests/mts/bpf_existence_test.cpp

diff --git a/tests/mts/bpf_existence_test.cpp b/tests/mts/bpf_existence_test.cpp
index db39e6f..2cd3310 100644
--- a/tests/mts/bpf_existence_test.cpp
+++ b/tests/mts/bpf_existence_test.cpp
@@ -124,6 +124,9 @@
 static const set<string> INTRODUCED_T_5_4 = {
     SHARED "prog_block_bind4_block_port",
     SHARED "prog_block_bind6_block_port",
+};
+
+static const set<string> INTRODUCED_T_5_15 = {
     SHARED "prog_dscp_policy_schedcls_set_dscp_ether",
     SHARED "prog_dscp_policy_schedcls_set_dscp_raw_ip",
 };
@@ -168,6 +171,7 @@
     if (IsAtLeastT()) {
         addAll(expected, INTRODUCED_T);
         if (android::bpf::isAtLeastKernelVersion(5, 4, 0)) addAll(expected, INTRODUCED_T_5_4);
+        if (android::bpf::isAtLeastKernelVersion(5, 15, 0)) addAll(expected, INTRODUCED_T_5_15);
         removeAll(expected, REMOVED_T);
 
         addAll(unexpected, REMOVED_T);