From 025b6eaa0d23e3f4b656105779ece9011c4cc5e2 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Wed, 14 May 2025 15:44:03 -0400
Subject: [PATCH] Use a macro to reduce boilerplate

---
 test/integration-test/src/lib.rs | 67 +++++++++++++++++---------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/test/integration-test/src/lib.rs b/test/integration-test/src/lib.rs
index 90277bb4..ea2df7d4 100644
--- a/test/integration-test/src/lib.rs
+++ b/test/integration-test/src/lib.rs
@@ -1,37 +1,40 @@
-use aya::include_bytes_aligned;
+macro_rules! bpf_file {
+    ($($uppercase:ident => $lowercase:literal),* $(,)?) => {
+        $(
+            pub const $uppercase: &[u8] = aya::include_bytes_aligned!(concat!(env!("OUT_DIR"), "/", $lowercase));
+        )*
+    };
+}
 
-pub const EXT: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/ext.bpf.o"));
-pub const ITER_TASK: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/iter.bpf.o"));
-pub const MAIN: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/main.bpf.o"));
-pub const MULTIMAP_BTF: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/multimap-btf.bpf.o"));
-pub const RELOC_BPF: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/reloc.bpf.o"));
-pub const RELOC_BTF: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/reloc.bpf.target.o"));
-pub const TEXT_64_64_RELOC: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/text_64_64_reloc.o"));
-pub const VARIABLES_RELOC: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/variables_reloc.bpf.o"));
+bpf_file!(
+    EXT => "ext.bpf.o",
+    ITER_TASK => "iter.bpf.o",
+    MAIN => "main.bpf.o",
+    MULTIMAP_BTF => "multimap-btf.bpf.o",
+    RELOC_BPF => "reloc.bpf.o",
+    RELOC_BTF => "reloc.bpf.target.o",
+    TEXT_64_64_RELOC => "text_64_64_reloc.o",
+    VARIABLES_RELOC => "variables_reloc.bpf.o",
+
+    BPF_PROBE_READ => "bpf_probe_read",
+    LOG => "log",
+    MAP_TEST => "map_test",
+    MEMMOVE_TEST => "memmove_test",
+    NAME_TEST => "name_test",
+    PASS => "pass",
+    RAW_TRACEPOINT => "raw_tracepoint",
+    REDIRECT => "redirect",
+    RELOCATIONS => "relocations",
+    RING_BUF => "ring_buf",
+    SIMPLE_PROG => "simple_prog",
+    STRNCMP => "strncmp",
+    TCX => "tcx",
+    TEST => "test",
+    TWO_PROGS => "two_progs",
+    XDP_SEC => "xdp_sec",
+    UPROBE_COOKIE => "uprobe_cookie",
+);
 
-pub const BPF_PROBE_READ: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/bpf_probe_read"));
-pub const LOG: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/log"));
-pub const MAP_TEST: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/map_test"));
-pub const MEMMOVE_TEST: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/memmove_test"));
-pub const NAME_TEST: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/name_test"));
-pub const PASS: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/pass"));
-pub const RAW_TRACEPOINT: &[u8] =
-    include_bytes_aligned!(concat!(env!("OUT_DIR"), "/raw_tracepoint"));
-pub const REDIRECT: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/redirect"));
-pub const RELOCATIONS: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/relocations"));
-pub const RING_BUF: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/ring_buf"));
-pub const SIMPLE_PROG: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/simple_prog"));
-pub const STRNCMP: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/strncmp"));
-pub const TCX: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/tcx"));
-pub const TEST: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/test"));
-pub const TWO_PROGS: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/two_progs"));
-pub const XDP_SEC: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/xdp_sec"));
-pub const UPROBE_COOKIE: &[u8] = include_bytes_aligned!(concat!(env!("OUT_DIR"), "/uprobe_cookie"));
 #[cfg(test)]
 mod tests;
 #[cfg(test)]