From b95db2808073beae71d41e07e2e1c3e6581c7d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Fri, 17 Jun 2022 04:44:33 -0700 Subject: [PATCH] adjust for newly added bpf map/prog definition fields in T+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed due to BpfLoader v0.18 supporting more functionality and thus bpf code compilation by default using larger structs than it did during S. Bug: 218408035 Test: booted on cuttlefish, atest CtsNativeNetTestCases OBSigned-off-by: Maciej Żenczykowski Change-Id: I0a37e59760fb0b55e6d6a6d12d5fd40106accd55 --- tests/cts/net/native/src/BpfCompatTest.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/native/src/BpfCompatTest.cpp b/tests/cts/net/native/src/BpfCompatTest.cpp index 97ecb9e217..e52533b51f 100644 --- a/tests/cts/net/native/src/BpfCompatTest.cpp +++ b/tests/cts/net/native/src/BpfCompatTest.cpp @@ -31,8 +31,13 @@ void doBpfStructSizeTest(const char *elfPath) { std::ifstream elfFile(elfPath, std::ios::in | std::ios::binary); ASSERT_TRUE(elfFile.is_open()); - EXPECT_EQ(48, readSectionUint("size_of_bpf_map_def", elfFile, 0)); - EXPECT_EQ(28, readSectionUint("size_of_bpf_prog_def", elfFile, 0)); + if (android::modules::sdklevel::IsAtLeastT()) { + EXPECT_EQ(116, readSectionUint("size_of_bpf_map_def", elfFile, 0)); + EXPECT_EQ(92, readSectionUint("size_of_bpf_prog_def", elfFile, 0)); + } else { + EXPECT_EQ(48, readSectionUint("size_of_bpf_map_def", elfFile, 0)); + EXPECT_EQ(28, readSectionUint("size_of_bpf_prog_def", elfFile, 0)); + } } TEST(BpfTest, bpfStructSizeTestPreT) {