diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 14:06:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 14:06:10 -0400 |
| commit | 69380033d644d39a7369e0cd2b2cb7fd5cd7c695 (patch) | |
| tree | 4c06dd268817276028ece95eeb6d1db91a7cb9a6 /src/test/include.am | |
| parent | 641cdc345c7a0e8123cee9a7b3864b63ba389afa (diff) | |
| parent | af132fc299f837f8749278099e6257cea3795e8e (diff) | |
| download | tor-69380033d644d39a7369e0cd2b2cb7fd5cd7c695.tar.gz tor-69380033d644d39a7369e0cd2b2cb7fd5cd7c695.zip | |
Merge branch 'timeouts_v2_squashed'
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index a3543ddbf4..991b24963a 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -17,6 +17,7 @@ endif TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ src/test/test_workqueue src/test/test_keygen.sh \ + src/test/test-timers \ $(TESTSCRIPTS) # These flavors are run using automake's test-driver and test-network.sh @@ -40,7 +41,8 @@ noinst_PROGRAMS+= \ src/test/test-memwipe \ src/test/test-child \ src/test/test_workqueue \ - src/test/test-switch-id + src/test/test-switch-id \ + src/test/test-timers endif src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ @@ -128,6 +130,8 @@ src_test_test_slow_SOURCES = \ src_test_test_memwipe_SOURCES = \ src/test/test-memwipe.c +src_test_test_timers_SOURCES = \ + src/test/test-timers.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) @@ -191,6 +195,16 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS) +src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS) +src_test_test_timers_LDADD = \ + src/common/libor-event-testing.a \ + src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ + src/common/libor-testing.a \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS) + noinst_HEADERS+= \ src/test/fakechans.h \ src/test/log_test_helpers.h \ |