1 files changed, 6 insertions, 7 deletions

diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index afd14962456f..37d427f5a1e5 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -56,9 +56,10 @@ struct test_env {
         bool jit_enabled;
 
         struct prog_test_def *test;
+        FILE *stdout;
+        FILE *stderr;
         char *log_buf;
         size_t log_cnt;
-        size_t log_cap;
 
         int succ_cnt; /* successful tests */
         int sub_succ_cnt; /* successful sub-tests */
@@ -69,8 +70,6 @@ extern int error_cnt;
 extern int pass_cnt;
 extern struct test_env env;
 
-extern void test__printf(const char *fmt, ...);
-extern void test__vprintf(const char *fmt, va_list args);
 extern void test__force_log();
 extern bool test__start_subtest(const char *name);
 
@@ -96,12 +95,12 @@ extern struct ipv6_packet pkt_v6;
         int __ret = !!(condition);                                      \
         if (__ret) {                                                    \
                 error_cnt++;                                            \
-                test__printf("%s:FAIL:%s ", __func__, tag);             \
-                test__printf(format);                                   \
+                printf("%s:FAIL:%s ", __func__, tag);                   \
+                printf(format);                                         \
         } else {                                                        \
                 pass_cnt++;                                             \
-                test__printf("%s:PASS:%s %d nsec\n",                    \
-                              __func__, tag, duration);                 \
+                printf("%s:PASS:%s %d nsec\n",                          \
+                       __func__, tag, duration);                        \
         }                                                               \
         __ret;                                                          \
 })