commit b73da9658c705ba3eaf81895bff32177890f4391
author Maciej Żenczykowski <maze@google.com> Thu Jul 14 08:32:14 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Thu Jul 14 08:33:22 2022 +0000
tree 8b68aa3a0897f2270c93a68693068d68b71f4d01
parent 1c7f6f89b2bd61d9adfd14388d2e2b48256ca17e

Adjust bpf_existence_test.cpp for dscp_policy 5.15+ change

The minimal required kernel version was changed in:
  https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141233
  'DscpPolicy Move to kernel 5.15'

Bug: 235559605
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibc1b1410155a2279ed84ec4cdc475f65dc61b077

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);