Commit 225aab5d6a611076b22f00ae5a28184d92b5259c
2014-04-28T16:47:39
Don't use trace if GIT_TRACE not defined
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c
index a225ebc..0fd41d3 100644
--- a/tests/diff/workdir.c
+++ b/tests/diff/workdir.c
@@ -5,6 +5,7 @@
static git_repository *g_repo = NULL;
+#ifdef GIT_TRACE
static struct {
size_t stat_calls;
size_t oid_calcs;
@@ -27,17 +28,22 @@ static void add_stats(git_trace_level_t level, const char *msg)
else if (!strncmp("oid_calculation", msg, (assign - msg)))
g_diff_perf.oid_calcs += atoi(assign + 1);
}
+#endif
void test_diff_workdir__initialize(void)
{
+#ifdef GIT_TRACE
memset(&g_diff_perf, 0, sizeof(g_diff_perf));
cl_git_pass(git_trace_set(GIT_TRACE_TRACE, add_stats));
+#endif
}
void test_diff_workdir__cleanup(void)
{
cl_git_sandbox_cleanup();
+#ifdef GIT_TRACE
cl_git_pass(git_trace_set(0, NULL));
+#endif
}
void test_diff_workdir__to_index(void)
@@ -1547,7 +1553,9 @@ static void basic_diff_status(git_diff **out, const git_diff_options *opts)
{
diff_expects exp;
+#ifdef GIT_TRACE
memset(&g_diff_perf, 0, sizeof(g_diff_perf));
+#endif
cl_git_pass(git_diff_index_to_workdir(out, g_repo, NULL, opts));
diff --git a/tests/status/worktree.c b/tests/status/worktree.c
index 0b94fb1..c1d6be9 100644
--- a/tests/status/worktree.c
+++ b/tests/status/worktree.c
@@ -7,6 +7,7 @@
#include "path.h"
#include <git2/trace.h>
+#ifdef GIT_TRACE
static struct {
size_t stat_calls;
size_t oid_calcs;
@@ -29,11 +30,14 @@ static void add_stats(git_trace_level_t level, const char *msg)
else if (!strncmp("oid_calculation", msg, (assign - msg)))
g_diff_perf.oid_calcs += atoi(assign + 1);
}
+#endif
void test_status_worktree__initialize(void)
{
+#ifdef GIT_TRACE
memset(&g_diff_perf, 0, sizeof(g_diff_perf));
cl_git_pass(git_trace_set(GIT_TRACE_TRACE, add_stats));
+#endif
}
/**
@@ -45,7 +49,9 @@ void test_status_worktree__initialize(void)
void test_status_worktree__cleanup(void)
{
cl_git_sandbox_cleanup();
+#ifdef GIT_TRACE
cl_git_pass(git_trace_set(0, NULL));
+#endif
}
/**