commit ec1ef5f0480ebec955c117e4c32763ffefc07eff
author Maciej Żenczykowski <maze@google.com> Thu Jul 14 16:27:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 14 16:27:45 2022 +0000
tree f1b6b18d26fd5d9cda1e4290e744ac9e6579df8b
parent a65eaad6576a027fc3c20db50d0f715d90d3259f
parent 26df963836da141ea2241b594ca73c36ba3f6ac8

Merge "Adjust bpf_existence_test.cpp for dscp_policy 5.15+ change" am: 26df963836

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2151272

Change-Id: I24d8c6972584687a8c75ab293186143c3a3675cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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