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.

diff --git a/src/test/bench.c b/src/test/bench.c
index ca01d3c3e6eea40d320cfb40ea5badbb2d537773..e650569a750b9b33b62f73336c88bc257bbed080 100644 (file)
--- 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 e3f2795f2dd147dceaecb29cb3a2e93d68d0a2ec..54adc40a8bc90ad88027119f26c7237c9ae1c69f 100644 (file)
--- 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 \