From c7f678688dc11a98f486e666f03026aab1101b48 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 26 Nov 2018 12:58:14 -0800
Subject: [PATCH] Stub out log functions when building tests

---
 programs/bpf/c/sdk/bpf.mk           |  2 +-
 programs/bpf/c/sdk/inc/solana_sdk.h | 23 ++++++++++++++++++-----
 programs/bpf/c/src/bench_alu.c      |  1 +
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/programs/bpf/c/sdk/bpf.mk b/programs/bpf/c/sdk/bpf.mk
index d803487ac0..71b9486038 100644
--- a/programs/bpf/c/sdk/bpf.mk
+++ b/programs/bpf/c/sdk/bpf.mk
@@ -31,7 +31,6 @@ endif
 
 SYSTEM_INC_DIRS := -isystem $(LOCAL_PATH)inc
 
-
 C_FLAGS := \
   -Werror \
   -O2 \
@@ -64,6 +63,7 @@ OBJ_DUMP_FLAGS := \
   -disassemble \
 
 TESTFRAMEWORK_FLAGS := \
+  -DSOL_TEST \
   -isystem $(LOCAL_PATH)criterion-v2.3.2/include \
   -L $(LOCAL_PATH)criterion-v2.3.2/lib \
   -lcriterion \
diff --git a/programs/bpf/c/sdk/inc/solana_sdk.h b/programs/bpf/c/sdk/inc/solana_sdk.h
index cc515b7a3e..a09450d4eb 100644
--- a/programs/bpf/c/sdk/inc/solana_sdk.h
+++ b/programs/bpf/c/sdk/inc/solana_sdk.h
@@ -61,13 +61,14 @@ static_assert(sizeof(uint64_t) == 8);
 /**
  * Helper function that prints a string to stdout
  */
-extern void sol_log(const char*);
+void sol_log(const char *);
 
 /**
  * Helper function that prints a 64 bit values represented in hexadecimal
  * to stdout
  */
-extern void sol_log_64(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+void sol_log_64(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+
 
 /**
  * Prefix for all BPF functions
@@ -227,8 +228,6 @@ SOL_FN_PREFIX bool sol_deserialize(
   uint64_t *data_len,
   SolClusterInfo *cluster_info
 ) {
-
-
   if (ka_len_out == NULL) {
     if (ka_len != *(uint64_t *) input) {
       return false;
@@ -336,7 +335,21 @@ SOL_FN_PREFIX void sol_log_params(
  * @param input Buffer of serialized input parameters.  Use sol_deserialize() to decode
  * @return true if the instruction executed successfully
  */
-extern bool entrypoint(const uint8_t *input);
+bool entrypoint(const uint8_t *input);
+
+
+#ifdef SOL_TEST
+/**
+ * Stub log functions when building tests
+ */
+#include <stdio.h>
+void sol_log(const char *s) {
+  printf("sol_log: %s\n", s);
+}
+void sol_log_64(uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4, uint64_t arg5) {
+  printf("sol_log_64: %llu, %llu, %llu, %llu, %llu\n", arg1, arg2, arg3, arg4, arg5);
+}
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/programs/bpf/c/src/bench_alu.c b/programs/bpf/c/src/bench_alu.c
index 5d804934e1..8c583775d9 100644
--- a/programs/bpf/c/src/bench_alu.c
+++ b/programs/bpf/c/src/bench_alu.c
@@ -24,6 +24,7 @@ extern bool entrypoint(const uint8_t *input) {
     }
   }
 
+  sol_log_64(x, count, 0, 0, 0);
   *result = count;
   return true;
 }