summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-23 01:19:16 -0400
committerNick Mathewson <nickm@torproject.org>2015-01-14 10:56:24 -0500
commita82604b526a2a258e057d6d515ac17429eb6fb67 (patch)
treef42e29cb20db95b0cf5fa2abc0c59d56841da3e6 /src/test/include.am
parent6c9363310aaea9d39fae4d9dd50e78d42c3598b3 (diff)
downloadtor-a82604b526a2a258e057d6d515ac17429eb6fb67.tar.gz
tor-a82604b526a2a258e057d6d515ac17429eb6fb67.zip
Initial workqueue implemention, with a simple test.
It seems to be working, but more tuning is needed.
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index b9b381fdae..6ad1b552b7 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -1,6 +1,6 @@
TESTS += src/test/test
-noinst_PROGRAMS+= src/test/bench
+noinst_PROGRAMS+= src/test/bench src/test/bench_workqueue
if UNITTESTS_ENABLED
noinst_PROGRAMS+= src/test/test src/test/test-child
endif
@@ -62,6 +62,9 @@ src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS)
src_test_bench_SOURCES = \
src/test/bench.c
+src_test_bench_workqueue_SOURCES = \
+ src/test/bench_workqueue.c
+
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 \
@@ -80,6 +83,14 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@
+src_test_bench_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
+ @TOR_LDFLAGS_libevent@
+src_test_bench_workqueue_LDADD = src/or/libtor.a src/common/libor.a \
+ src/common/libor-crypto.a $(LIBDONNA) \
+ src/common/libor-event.a \
+ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
+ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+
noinst_HEADERS+= \
src/test/fakechans.h \
src/test/test.h \