diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-21 14:47:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-21 14:47:16 -0500 |
| commit | 23fc1691b6dff4b0a3ad173809915901eb47fcab (patch) | |
| tree | 30e39346fb1fbd44ec4b5c71e4c8fbb53848c0b2 /src/test/include.am | |
| parent | f0415c16001ebfd06aec7a16bdf8677c7a931b65 (diff) | |
| parent | 84f5cb749d614deeb66f9032c54cd9885e300493 (diff) | |
| download | tor-23fc1691b6dff4b0a3ad173809915901eb47fcab.tar.gz tor-23fc1691b6dff4b0a3ad173809915901eb47fcab.zip | |
Merge branch 'better_workqueue_v3_squashed'
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index 134c2ff56c..3c59a8b3c7 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -2,7 +2,7 @@ TESTS += src/test/test noinst_PROGRAMS+= src/test/bench if UNITTESTS_ENABLED -noinst_PROGRAMS+= src/test/test src/test/test-child +noinst_PROGRAMS+= src/test/test src/test/test-child src/test/test_workqueue endif src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ @@ -47,6 +47,7 @@ src_test_test_SOURCES = \ src/test/test_routerkeys.c \ src/test/test_scheduler.c \ src/test/test_socks.c \ + src/test/test_threads.c \ src/test/test_util.c \ src/test/test_config.c \ src/test/test_hs.c \ @@ -63,6 +64,11 @@ src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) src_test_bench_SOURCES = \ src/test/bench.c +src_test_test_workqueue_SOURCES = \ + src/test/test_workqueue.c +src_test_test_workqueue_CPPFLAGS= $(src_test_AM_CPPFLAGS) +src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + 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 \ @@ -81,6 +87,15 @@ 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_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ + @TOR_LDFLAGS_libevent@ +src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ + src/common/libor-testing.a \ + src/common/libor-crypto-testing.a $(LIBDONNA) \ + src/common/libor-event-testing.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 \ |