From 2f2fa7683d768ce165e9fc5b6f22d2fdcd79d9ca Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Sep 2013 21:42:38 -0400
Subject: [PATCH] Fix benchmarks to run without crashing.

I broke this when I added separate test-mode support by having
the benchmarks get built with TEST_CFLAGS.
---
 src/test/bench.c    | 2 --
 src/test/include.am | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/test/bench.c b/src/test/bench.c
index ca01d3c3e6..e650569a75 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -14,8 +14,6 @@ const char tor_git_revision[] = "";
 
 #include "orconfig.h"
 
-#define RELAY_PRIVATE
-
 #include "or.h"
 #include "onion_tap.h"
 #include "relay.h"
diff --git a/src/test/include.am b/src/test/include.am
index e3f2795f2d..54adc40a8b 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -45,8 +45,6 @@ src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS)
 src_test_bench_SOURCES = \
 	src/test/bench.c
 
-src_test_bench_CPPFLAGS= $(src_test_AM_CPPFLAGS)
-
 src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
 src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \