commit 0056fdce27095a8207e600c6cf45a0fdcfefe1ac
author Connor O'Brien <connoro@google.com> Fri Jan 21 18:21:23 2022 -0800
committer Connor O'Brien <connoro@google.com> Mon Jan 24 20:10:56 2022 -0800
tree 810bf7e384b359cdbcbf477ad9cab3702769af20
parent 102f93a5dac0199f13bf629513eb95459e4dbf95

Test loading both with & without BTF

Add path to a test program with BTF info included to test bpfloader
handles both situations correctly

Test: libbpf_load_test
Bug: 203823368
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Ibe63cdc2ee59199b687d4006efadb201d4a17f3c

libbpf_android/BpfLoadTest.cpp

diff --git a/libbpf_android/BpfLoadTest.cpp b/libbpf_android/BpfLoadTest.cpp
index 72c0fc1..715ae95 100644
--- a/libbpf_android/BpfLoadTest.cpp
+++ b/libbpf_android/BpfLoadTest.cpp
@@ -99,7 +99,8 @@
 };
 
 INSTANTIATE_TEST_SUITE_P(BpfLoadTests, BpfLoadTest,
-                         ::testing::Values("/system/etc/bpf/bpf_load_tp_prog.o"));
+                         ::testing::Values("/system/etc/bpf/bpf_load_tp_prog.o",
+                                           "/system/etc/bpf/bpf_load_tp_prog_btf.o"));
 
 TEST_P(BpfLoadTest, bpfCheckMap) {
     checkMapNonZero();